betterstart-cli 0.0.105 → 0.0.107

package/dist/assets/adapters/next/templates/init/components/layouts/admin-nav-link.tsx

@@ -20,14 +20,16 @@ export function AdminNavLink({
       : pathname === href || pathname.startsWith(`${href}/`)
 
   return (
-    <SidebarMenuButton asChild>
-      <Link
-        aria-current={isActive ? 'page' : undefined}
-        data-active={isActive ? true : undefined}
-        href={href}
-      >
-        {children}
-      </Link>
+    <SidebarMenuButton
+      render={
+        <Link
+          aria-current={isActive ? 'page' : undefined}
+          data-active={isActive ? true : undefined}
+          href={href}
+        />
+      }
+    >
+      {children}
     </SidebarMenuButton>
   )
 }

package/dist/assets/adapters/next/templates/init/components/layouts/admin-sidebar-nav-link-skeleton.tsx

@@ -3,9 +3,5 @@ import { SidebarMenuButton } from '@admin/components/ui/sidebar'
 import Link from 'next/link'
 
 export function SidebarNavLinkSkeleton({ href, children }: { href: string; children: ReactNode }) {
-  return (
-    <SidebarMenuButton asChild>
-      <Link href={href}>{children}</Link>
-    </SidebarMenuButton>
-  )
+  return <SidebarMenuButton render={<Link href={href} />}>{children}</SidebarMenuButton>
 }

package/dist/assets/adapters/next/templates/init/components/layouts/admin-sidebar-user-menu.tsx

@@ -24,61 +24,67 @@ export async function SidebarUserMenu() {
     <SidebarMenu className="h-full">
       <SidebarMenuItem className="h-full">
         <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button
-              variant="ghost"
-              className="h-full w-full justify-start border-none bg-transparent! px-3 text-left ring-0!"
-            >
-              <Avatar className="size-8 shrink-0">
-                <AvatarImage src={user.image ?? undefined} />
-                <AvatarFallback className="text-xs font-semibold group-hover:bg-white">
-                  {user.name?.charAt(0) ?? user.email?.charAt(0) ?? '?'}
-                </AvatarFallback>
-              </Avatar>
-              <div className="flex-1 truncate group-data-[collapsible=icon]:hidden">
-                <p className="truncate font-medium">{user.name}</p>
-              </div>
+          <DropdownMenuTrigger
+            render={
+              <Button
+                variant="ghost"
+                className="h-full w-full justify-start border-none bg-transparent! px-3 text-left ring-0!"
+              >
+                <Avatar className="size-8 shrink-0">
+                  <AvatarImage src={user.image ?? undefined} />
+                  <AvatarFallback className="text-xs font-semibold group-hover:bg-white">
+                    {user.name?.charAt(0) ?? user.email?.charAt(0) ?? '?'}
+                  </AvatarFallback>
+                </Avatar>
+                <div className="flex-1 truncate group-data-[collapsible=icon]:hidden">
+                  <p className="truncate font-medium">{user.name}</p>
+                </div>
 
-              <div className="group-data-[collapsible=icon]:hidden">
-                <span
-                  className={cn(
-                    buttonVariants({ variant: 'outline', size: 'icon' }),
-                    'size-7 rounded-sm group-hover:bg-white'
-                  )}
-                >
-                  <Ellipsis strokeWidth={2} className="size-4" />
-                </span>
-              </div>
-            </Button>
-          </DropdownMenuTrigger>
+                <div className="group-data-[collapsible=icon]:hidden">
+                  <span
+                    className={cn(
+                      buttonVariants({ variant: 'outline', size: 'icon' }),
+                      'size-7 rounded-sm group-hover:bg-white'
+                    )}
+                  >
+                    <Ellipsis strokeWidth={2} className="size-4" />
+                  </span>
+                </div>
+              </Button>
+            }
+          />
           <DropdownMenuContent align="start" alignOffset={12} className="w-68 p-1">
             <DropdownMenuGroup>
-              <DropdownMenuItem className="justify-between" asChild>
-                <Link
-                  href="/admin/profile"
-                  prefetch={true}
-                  className="flex w-full items-center justify-between gap-2 py-2 pr-1"
-                >
-                  <div className="flex items-center gap-2">
-                    <div className="flex flex-col">
-                      <p className="truncate font-medium">{user.name}</p>
-                      <p className="truncate text-sm font-normal text-muted-foreground [text-box-trim:trim-start]">
-                        {user.email}
-                      </p>
-                    </div>
+              <DropdownMenuItem
+                className="justify-between"
+                render={
+                  <Link
+                    href="/admin/profile"
+                    prefetch={true}
+                    className="flex w-full items-center justify-between gap-2 py-2 pr-1"
+                  />
+                }
+              >
+                <div className="flex items-center gap-2">
+                  <div className="flex flex-col">
+                    <p className="truncate font-medium">{user.name}</p>
+                    <p className="truncate text-sm font-normal text-muted-foreground [text-box-trim:trim-start]">
+                      {user.email}
+                    </p>
                   </div>
-                  <Button variant="ghost" className="pointer-events-none size-8! shrink-0">
-                    <Settings strokeWidth={2} className="size-4" />
-                  </Button>
-                </Link>
+                </div>
+                <Button variant="ghost" className="pointer-events-none size-8! shrink-0">
+                  <Settings strokeWidth={2} className="size-4" />
+                </Button>
               </DropdownMenuItem>
             </DropdownMenuGroup>
             <DropdownMenuGroup>
-              <DropdownMenuItem className="justify-between" asChild>
-                <Link href="https://betterstart.io/docs" target="_blank">
-                  <span>Docs</span>
-                  <BookOpen strokeWidth={1.2} className="size-4" />
-                </Link>
+              <DropdownMenuItem
+                className="justify-between"
+                render={<Link href="https://betterstart.io/docs" target="_blank" />}
+              >
+                <span>Docs</span>
+                <BookOpen strokeWidth={1.2} className="size-4" />
               </DropdownMenuItem>
               <AdminSignOut className="justify-between" />
             </DropdownMenuGroup>

package/dist/assets/adapters/next/templates/init/components/layouts/admin-sign-out.tsx

@@ -48,8 +48,8 @@ export function AdminSignOut({
 
   return (
     <DropdownMenuItem
-      onSelect={(event) => {
-        event.preventDefault()
+      closeOnClick={false}
+      onClick={() => {
         handleSignOut()
       }}
       disabled={isPending}

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-grid-body.tsx

@@ -0,0 +1,20 @@
+'use client'
+
+import type * as React from 'react'
+import { cn } from '@admin/utils/shared/cn'
+
+function DataGridBody({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      role="rowgroup"
+      data-slot="data-grid-body"
+      className={cn(
+        "relative col-span-full grid grid-cols-subgrid overflow-hidden rounded-sm bg-card shadow-input after:pointer-events-none after:absolute after:inset-0 after:rounded-sm after:border after:border-border after:content-['']",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { DataGridBody }

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-grid-cell.tsx

@@ -0,0 +1,20 @@
+'use client'
+
+import type * as React from 'react'
+import { cn } from '@admin/utils/shared/cn'
+
+function DataGridCell({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      role="cell"
+      data-slot="data-grid-cell"
+      className={cn(
+        'grid min-h-12 items-center px-3 py-1.5 whitespace-nowrap [&:has([role=checkbox])]:pr-0',
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { DataGridCell }

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-grid-head.tsx

@@ -0,0 +1,21 @@
+'use client'
+
+import type * as React from 'react'
+import { cn } from '@admin/utils/shared/cn'
+
+function DataGridHead({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      role="columnheader"
+      data-slot="data-grid-head"
+      className={cn(
+        'grid h-9.5 items-center px-3 text-left font-medium whitespace-nowrap text-muted-foreground *:h-full [&:has([role=checkbox])]:pr-0',
+        className
+      )}
+      tabIndex={-1}
+      {...props}
+    />
+  )
+}
+
+export { DataGridHead }

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-grid-header.tsx

@@ -0,0 +1,20 @@
+'use client'
+
+import type * as React from 'react'
+import { cn } from '@admin/utils/shared/cn'
+
+function DataGridHeader({ className, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      role="rowgroup"
+      data-slot="data-grid-header"
+      className={cn(
+        "relative col-span-full -mb-1 grid grid-cols-subgrid rounded-t-sm bg-muted pb-1 after:pointer-events-none after:absolute after:inset-0 after:rounded-t-sm after:border-x after:border-t after:border-border after:content-['']",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export { DataGridHeader }

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-grid-row.tsx

@@ -0,0 +1,22 @@
+'use client'
+
+import type * as React from 'react'
+import { cn } from '@admin/utils/shared/cn'
+
+function DataGridRow({ className, style, ...props }: React.ComponentProps<'div'>) {
+  return (
+    <div
+      role="row"
+      data-slot="data-grid-row"
+      className={cn(
+        'grid border-b transition-colors last:border-b-0 has-aria-expanded:bg-muted/50 data-[state=selected]:bg-muted',
+        className
+      )}
+      style={{ ...style, gridColumn: '1 / -1', gridTemplateColumns: 'subgrid' }}
+      tabIndex={-1}
+      {...props}
+    />
+  )
+}
+
+export { DataGridRow }

package/dist/assets/adapters/next/templates/init/components/shared/data-table/data-grid.tsx

@@ -9,12 +9,6 @@ type DataGridProps = React.ComponentProps<'div'> & {
   gridTemplateColumns: string
 }
 
-const dataGridTableRole = { role: 'table' } as const
-const dataGridRowGroupRole = { role: 'rowgroup' } as const
-const dataGridRowRole = { role: 'row' } as const
-const dataGridColumnHeaderRole = { role: 'columnheader' } as const
-const dataGridCellRole = { role: 'cell' } as const
-
 function DataGrid({
   className,
   containerClassName,
@@ -30,7 +24,7 @@ function DataGrid({
       className={cn('relative min-w-0 overflow-auto', containerClassName)}
     >
       <div
-        {...dataGridTableRole}
+        role="table"
         data-slot="data-grid"
         className={cn('grid min-w-full text-sm', className)}
         style={{ ...style, gridTemplateColumns }}
@@ -40,77 +34,9 @@ function DataGrid({
   )
 }
 
-function DataGridHeader({ className, ...props }: React.ComponentProps<'div'>) {
-  return (
-    <div
-      {...dataGridRowGroupRole}
-      data-slot="data-grid-header"
-      className={cn(
-        "relative col-span-full -mb-1 grid grid-cols-subgrid rounded-t-sm bg-muted pb-1 after:pointer-events-none after:absolute after:inset-0 after:rounded-t-sm after:border-x after:border-t after:border-border after:content-['']",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function DataGridBody({ className, ...props }: React.ComponentProps<'div'>) {
-  return (
-    <div
-      {...dataGridRowGroupRole}
-      data-slot="data-grid-body"
-      className={cn(
-        "relative col-span-full grid grid-cols-subgrid overflow-hidden rounded-sm bg-card shadow-input after:pointer-events-none after:absolute after:inset-0 after:rounded-sm after:border after:border-border after:content-['']",
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-function DataGridRow({ className, style, ...props }: React.ComponentProps<'div'>) {
-  return (
-    <div
-      {...dataGridRowRole}
-      data-slot="data-grid-row"
-      className={cn(
-        'grid border-b transition-colors last:border-b-0 has-aria-expanded:bg-muted/50 data-[state=selected]:bg-muted',
-        className
-      )}
-      style={{ ...style, gridColumn: '1 / -1', gridTemplateColumns: 'subgrid' }}
-      tabIndex={-1}
-      {...props}
-    />
-  )
-}
-
-function DataGridHead({ className, ...props }: React.ComponentProps<'div'>) {
-  return (
-    <div
-      {...dataGridColumnHeaderRole}
-      data-slot="data-grid-head"
-      className={cn(
-        'grid h-9.5 items-center px-3 text-left font-medium whitespace-nowrap text-muted-foreground *:h-full [&:has([role=checkbox])]:pr-0',
-        className
-      )}
-      tabIndex={-1}
-      {...props}
-    />
-  )
-}
-
-function DataGridCell({ className, ...props }: React.ComponentProps<'div'>) {
-  return (
-    <div
-      {...dataGridCellRole}
-      data-slot="data-grid-cell"
-      className={cn(
-        'grid min-h-12 items-center px-3 py-1.5 whitespace-nowrap [&:has([role=checkbox])]:pr-0',
-        className
-      )}
-      {...props}
-    />
-  )
-}
-
-export { DataGrid, DataGridHeader, DataGridBody, DataGridHead, DataGridRow, DataGridCell }
+export { DataGridBody } from './data-grid-body'
+export { DataGridCell } from './data-grid-cell'
+export { DataGridHead } from './data-grid-head'
+export { DataGridHeader } from './data-grid-header'
+export { DataGridRow } from './data-grid-row'
+export { DataGrid }

package/dist/assets/adapters/next/templates/init/components/shared/delete-dialog.tsx

@@ -34,11 +34,9 @@ export function DeleteDialog({
 
   return (
     <AlertDialog open={open} onOpenChange={setOpen}>
-      <AlertDialogTrigger asChild>
-        <Button variant="destructive" size="default">
-          <Trash2 className="-ml-0.5 size-3.5" strokeWidth={2} />
-          Delete {count} {label}
-        </Button>
+      <AlertDialogTrigger render={<Button variant="destructive" size="default" />}>
+        <Trash2 className="-ml-0.5 size-3.5" strokeWidth={2} />
+        Delete {count} {label}
       </AlertDialogTrigger>
       <AlertDialogContent>
         <AlertDialogHeader>

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode/lifecycle-hooks-tab.tsx

@@ -50,7 +50,7 @@ export function LifecycleHooksTab({ lifecycleHooks }: LifecycleHooksTabProps) {
   }
 
   return (
-    <Accordion type="single" defaultValue={firstHook.id} className="min-h-0 shrink-0 rounded-sm">
+    <Accordion defaultValue={[firstHook.id]} className="min-h-0 shrink-0 rounded-sm">
       {lifecycleHooks.map((hook) => {
         const HookIcon = LIFECYCLE_HOOK_ICONS[hook.icon]
         const phaseLabel = LIFECYCLE_HOOK_PHASE_LABELS[hook.phase]

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode/snippets-tab.tsx

@@ -47,7 +47,7 @@ export function SnippetsTab({ snippets }: SnippetsTabProps) {
   }
 
   return (
-    <Accordion type="single" defaultValue={firstSnippet.id} className="min-h-0 shrink-0 rounded-sm">
+    <Accordion defaultValue={[firstSnippet.id]} className="min-h-0 shrink-0 rounded-sm">
       {snippets.map((snippet) => {
         const SnippetIcon = SNIPPET_ICONS[snippet.icon]
         const snippetKindLabel = SNIPPET_KIND_LABELS[snippet.kind]

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode-integrate.tsx

@@ -46,14 +46,12 @@ export function DevModeIntegrateButton({
   }
 
   return (
-    <Drawer direction="right" handleOnly onOpenChange={handleOpenChange}>
-      <DrawerTrigger asChild>
-        <Button type="button" variant="outline">
-          <Code2 />
-          <span className="hidden sm:inline">Dev Mode</span>
-        </Button>
+    <Drawer swipeDirection="right" onOpenChange={handleOpenChange}>
+      <DrawerTrigger render={<Button type="button" variant="outline" />}>
+        <Code2 />
+        <span className="hidden sm:inline">Dev Mode</span>
       </DrawerTrigger>
-      <DrawerContent className="w-full overflow-hidden data-[vaul-drawer-direction=right]:sm:max-w-2xl data-[vaul-drawer-direction=right]:lg:max-w-4xl">
+      <DrawerContent className="w-full overflow-hidden data-[swipe-direction=right]:sm:max-w-2xl data-[swipe-direction=right]:lg:max-w-4xl">
         <DrawerHeader className="pb-4">
           <DrawerTitle>{integration.schemaLabel}</DrawerTitle>
           <DrawerDescription>

package/dist/assets/adapters/next/templates/init/components/shared/entity-filters-bar.tsx

@@ -104,17 +104,16 @@ export function EntityFiltersBar({
           return (
             <div key={filter.key} className="relative flex items-center gap-1">
               <DropdownMenu>
-                <DropdownMenuTrigger asChild>
-                  <Button variant="outline" className="w-45 justify-between">
-                    {filter.value
-                      ? (filter.options.find((o) => o.value === filter.value)?.label ??
-                        filter.label)
-                      : `All ${filter.label}`}
+                <DropdownMenuTrigger
+                  render={<Button variant="outline" className="w-45 justify-between" />}
+                >
+                  {filter.value
+                    ? (filter.options.find((o) => o.value === filter.value)?.label ?? filter.label)
+                    : `All ${filter.label}`}
 
-                    {!filter.value && (
-                      <ChevronDown className="absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-foreground" />
-                    )}
-                  </Button>
+                  {!filter.value && (
+                    <ChevronDown className="absolute top-1/2 right-2.5 size-4 -translate-y-1/2 text-foreground" />
+                  )}
                 </DropdownMenuTrigger>
                 <DropdownMenuContent align="start">
                   <DropdownMenuRadioGroup

package/dist/assets/adapters/next/templates/init/components/shared/entity-versions/entity-version-item.tsx

@@ -36,10 +36,8 @@ export function EntityVersionItem({
             <Badge variant="secondary">v{version.version}</Badge>
           </div>
           <Tooltip>
-            <TooltipTrigger asChild>
-              <p className="w-fit text-xs text-muted-foreground">
-                Saved {formatDistanceToNow(createdDate, { addSuffix: true })}
-              </p>
+            <TooltipTrigger render={<p className="w-fit text-xs text-muted-foreground" />}>
+              Saved {formatDistanceToNow(createdDate, { addSuffix: true })}
             </TooltipTrigger>
             <TooltipContent>{format(createdDate, 'PPpp')}</TooltipContent>
           </Tooltip>

package/dist/assets/adapters/next/templates/init/components/shared/entity-versions/entity-version-restore-dialog.tsx

@@ -48,10 +48,8 @@ export function EntityVersionRestoreDialog({
 
   return (
     <AlertDialog open={open} onOpenChange={setOpen}>
-      <AlertDialogTrigger asChild>
-        <Button variant="outline" size="sm">
-          Restore
-        </Button>
+      <AlertDialogTrigger render={<Button variant="outline" size="sm" />}>
+        Restore
       </AlertDialogTrigger>
       <AlertDialogContent>
         <AlertDialogHeader>

package/dist/assets/adapters/next/templates/init/components/shared/entity-versions/entity-versions-current-row.tsx

@@ -34,10 +34,8 @@ export function EntityVersionsCurrentRow({ updatedAt, author }: EntityVersionsCu
             <Badge variant="outline">Current</Badge>
           </div>
           <Tooltip>
-            <TooltipTrigger asChild>
-              <p className="w-fit text-xs text-muted-foreground">
-                Edited {formatDistanceToNow(updatedDate, { addSuffix: true })}
-              </p>
+            <TooltipTrigger render={<p className="w-fit text-xs text-muted-foreground" />}>
+              Edited {formatDistanceToNow(updatedDate, { addSuffix: true })}
             </TooltipTrigger>
             <TooltipContent>{format(updatedDate, 'PPpp')}</TooltipContent>
           </Tooltip>

package/dist/assets/adapters/next/templates/init/components/shared/entity-versions/entity-versions-drawer.tsx

@@ -42,7 +42,7 @@ export function EntityVersionsDrawer({
   onRestored
 }: EntityVersionsDrawerProps) {
   return (
-    <Drawer direction="right" open={open} onOpenChange={onOpenChange} modal>
+    <Drawer swipeDirection="right" open={open} onOpenChange={onOpenChange} modal>
       <DrawerContent className="h-full sm:max-w-lg">
         <DrawerHeader>
           <DrawerTitle>Versions</DrawerTitle>

package/dist/assets/adapters/next/templates/init/components/shared/media/edit-media-dialog.tsx

@@ -31,10 +31,10 @@ export function EditMediaDialog({ media, open, onOpenChange, onSaved }: EditMedi
 
   return (
     <Drawer
-      direction="right"
+      swipeDirection="right"
       open={isOpen}
       onOpenChange={handleOpenChange}
-      onAnimationEnd={(nextOpen) => {
+      onOpenChangeComplete={(nextOpen) => {
         if (nextOpen) {
           setClosingMedia(null)
           return

package/dist/assets/adapters/next/templates/init/components/shared/media/media-delete-dialog.tsx

@@ -52,11 +52,11 @@ export function MediaDeleteDialog({ media, disabled = false, onDeleted }: MediaD
 
   return (
     <AlertDialog>
-      <AlertDialogTrigger asChild>
-        <Button variant="destructive" disabled={disabled || isPending}>
-          <Trash2 />
-          Delete media
-        </Button>
+      <AlertDialogTrigger
+        render={<Button variant="destructive" disabled={disabled || isPending} />}
+      >
+        <Trash2 />
+        Delete media
       </AlertDialogTrigger>
       <AlertDialogContent>
         <AlertDialogHeader>