betterstart-cli 0.0.105 → 0.0.107

package/dist/cli.js

@@ -2769,33 +2769,6 @@ var REACT_ADMIN_DEPS = [
   "@dnd-kit/sortable",
   "@dnd-kit/utilities",
   "@floating-ui/react",
-  "@radix-ui/react-accordion",
-  "@radix-ui/react-alert-dialog",
-  "@radix-ui/react-aspect-ratio",
-  "@radix-ui/react-avatar",
-  "@radix-ui/react-checkbox",
-  "@radix-ui/react-collapsible",
-  "@radix-ui/react-context-menu",
-  "@radix-ui/react-dialog",
-  "@radix-ui/react-dropdown-menu",
-  "@radix-ui/react-hover-card",
-  "@radix-ui/react-label",
-  "@radix-ui/react-menubar",
-  "@radix-ui/react-navigation-menu",
-  "@radix-ui/react-popover",
-  "@radix-ui/react-progress",
-  "@radix-ui/react-radio-group",
-  "@radix-ui/react-scroll-area",
-  "@radix-ui/react-select",
-  "@radix-ui/react-separator",
-  "@radix-ui/react-slider",
-  "@radix-ui/react-slot",
-  "@radix-ui/react-switch",
-  "@radix-ui/react-tabs",
-  "@radix-ui/react-toast",
-  "@radix-ui/react-toggle",
-  "@radix-ui/react-toggle-group",
-  "@radix-ui/react-tooltip",
   "@tiptap/core",
   "@tiptap/extension-underline",
   "@tiptap/extension-highlight",
@@ -2822,12 +2795,10 @@ var REACT_ADMIN_DEPS = [
   "lodash.throttle",
   "motion",
   "next-themes",
-  "radix-ui",
   "react-day-picker",
   "react-hotkeys-hook",
   "react-resizable-panels",
-  "recharts",
-  "vaul"
+  "recharts"
 ];
 var REACT_ADMIN_DEV_DEPS = ["@tailwindcss/typography"];
 var CORE_DEPS = Array.from(/* @__PURE__ */ new Set([...NEXT_ADAPTER_DEPS, ...REACT_ADMIN_DEPS]));
@@ -6313,12 +6284,18 @@ export function ${componentName}({
 
   return (
     <AlertDialog open={open} onOpenChange={onOpenChange}>
-      <AlertDialogTrigger asChild>
-        <DropdownMenuItem variant="destructive" onSelect={(event) => event.preventDefault()}>
-          <Trash className="size-4" />
-          Delete ${escapeJsx2}
-        </DropdownMenuItem>
-      </AlertDialogTrigger>
+      <AlertDialogTrigger
+        render={
+          <DropdownMenuItem
+            variant="destructive"
+            closeOnClick={false}
+            onClick={(event) => event.preventDefault()}
+          >
+            <Trash className="size-4" />
+            Delete ${escapeJsx2}
+          </DropdownMenuItem>
+        }
+      />
       <AlertDialogContent>
         <AlertDialogHeader>
           <AlertDialogTitle>Delete ${escapeJsx2}?</AlertDialogTitle>
@@ -6401,16 +6378,18 @@ export function ${componentName}({ id }: { id: string }) {
 
   return (
     <DropdownMenu open={menuOpen} onOpenChange={setMenuOpen}>
-      <DropdownMenuTrigger asChild>
-        <Button
-          variant="ghost"
-          className="size-8 p-0"
-          aria-label={\`Open ${escapeTemplateText2} actions for \${id}\`}
-        >
-          <span className="sr-only">Open ${escapeJsx2} actions</span>
-          <MoreHorizontal className="size-4" />
-        </Button>
-      </DropdownMenuTrigger>
+      <DropdownMenuTrigger
+        render={
+          <Button
+            variant="ghost"
+            className="size-8 p-0"
+            aria-label={\`Open ${escapeTemplateText2} actions for \${id}\`}
+          >
+            <span className="sr-only">Open ${escapeJsx2} actions</span>
+            <MoreHorizontal className="size-4" />
+          </Button>
+        }
+      />
       <DropdownMenuContent align="end">
         <${dialogComponentName}
           id={id}
@@ -6923,11 +6902,9 @@ ${deleteTransition}${bulkDeleteHandler}
         actions={
           <div className="flex items-center gap-1">
             <${devModeIntegrateButtonExportName} initialSettings={initialSettings} />${exportButton}
-            <Button variant="outline" asChild>
-              <Link href="${adminRoutePath}/settings/forms">
+            <Button variant="outline" render={<Link href="${adminRoutePath}/settings/forms" />}>
                 <Settings className="size-3.5" />
                 Settings
-              </Link>
             </Button>
           </div>
         }
@@ -7223,8 +7200,8 @@ export function ${pascal}SubmissionDrawer({
       : 'No submission selected'
 
   return (
-    <Drawer direction="right" open={open} onOpenChange={onOpenChange} modal>
-      <DrawerContent className="h-full w-full overflow-hidden data-[vaul-drawer-direction=right]:sm:max-w-xl">
+    <Drawer swipeDirection="right" open={open} onOpenChange={onOpenChange} modal>
+      <DrawerContent className="h-full w-full overflow-hidden data-[swipe-direction=right]:sm:max-w-xl">
         <DrawerHeader>
           <DrawerTitle>${label} Submission</DrawerTitle>
           <DrawerDescription>{description}</DrawerDescription>
@@ -16936,18 +16913,17 @@ ${indent}        </Button>
 ${indent}      </div>
 
 ${indent}      <Accordion
-${indent}        type="single"
-${indent}        collapsible
-${indent}        value={${fieldName}Expanded}
+${indent}        value={${fieldName}Expanded ? [${fieldName}Expanded] : []}
 ${indent}        onValueChange={async (nextValue) => {
-${indent}          if (${fieldName}Expanded && nextValue && nextValue !== ${fieldName}Expanded) {
+${indent}          const nextExpanded = nextValue[0] ?? ''
+${indent}          if (${fieldName}Expanded && nextExpanded && nextExpanded !== ${fieldName}Expanded) {
 ${indent}            const expandedIndex = Number(${fieldName}Expanded.replace('item-', '')) - 1
 ${indent}            if (expandedIndex >= 0) {
 ${indent}              const isExpandedItemValid = await form.trigger(${validateExpandedItemExpression})
 ${indent}              if (!isExpandedItemValid) return
 ${indent}            }
 ${indent}          }
-${indent}          set${pascalFieldName}Expanded(nextValue)
+${indent}          set${pascalFieldName}Expanded(nextExpanded)
 ${indent}        }}
 ${indent}      >
 ${indent}        {${fieldName}FieldArray.fields.map((item, index) => (
@@ -18161,23 +18137,25 @@ ${indent}  render={({ field: formField }) => (
 ${indent}    <FormItem${formItemProps2}>
 ${indent}      ${labelWithDescription2}
 ${indent}      <Popover open={${fieldName}Open} onOpenChange={set${toPascalCase2}Open}>
-${indent}        <PopoverTrigger asChild>
-${indent}          <FormControl>
-${indent}            <Button
+${indent}        <PopoverTrigger
+${indent}          render={
+${indent}            <FormControl>
+${indent}              <Button
 ${indent}              variant="outline"
 ${indent}              role="combobox"
 ${indent}              className={cn("w-full justify-between", {
 ${indent}                "text-muted-foreground": !formField.value || formField.value.length === 0
 ${indent}              })}
 ${indent}              disabled={isPending}
-${indent}            >
+${indent}              >
 ${indent}              {(formField.value?.length ?? 0) > 0
 ${indent}                ? \`\${formField.value?.length ?? 0} selected\`
 ${indent}                : "Select ${toLowerCase}"}
-${indent}              <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
-${indent}            </Button>
-${indent}          </FormControl>
-${indent}        </PopoverTrigger>
+${indent}                <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
+${indent}              </Button>
+${indent}            </FormControl>
+${indent}          }
+${indent}        />
 ${indent}        <PopoverContent className="w-full p-0" align="start">
 ${indent}          <Command>
 ${indent}            <CommandInput placeholder="Search ${toLowerCase}..." />
@@ -18266,26 +18244,28 @@ ${indent}  render={({ field: formField }) => (
 ${indent}    <FormItem${formItemProps2}>
 ${indent}      ${labelWithDescription2}
 ${indent}      <Popover open={${fieldName}Open} onOpenChange={set${toPascalCase2}Open}>
-${indent}        <PopoverTrigger asChild>
-${indent}          <FormControl>
-${indent}            <Button
+${indent}        <PopoverTrigger
+${indent}          render={
+${indent}            <FormControl>
+${indent}              <Button
 ${indent}              variant="outline"
 ${indent}              role="combobox"
 ${indent}              className={cn("w-full justify-between", {
 ${indent}                "text-muted-foreground": !formField.value
 ${indent}              })}
 ${indent}              disabled={isPending}
-${indent}            >
+${indent}              >
 ${indent}              {formField.value
 ${indent}                ? (() => {
 ${indent}                    const item = ${dataArray}?.find((item) => item.id !== null && String(item.id) === formField.value)
 ${indent}                    return item ? (${displayField}) : "Select ${toLowerCase}"
 ${indent}                  })()
 ${indent}                : "Select ${toLowerCase}"}
-${indent}              <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
-${indent}            </Button>
-${indent}          </FormControl>
-${indent}        </PopoverTrigger>
+${indent}                <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
+${indent}              </Button>
+${indent}            </FormControl>
+${indent}          }
+${indent}        />
 ${indent}        <PopoverContent className="w-full p-0" align="start">
 ${indent}          <Command>
 ${indent}            <CommandInput placeholder="Search ${toLowerCase}..." />
@@ -18497,7 +18477,7 @@ ${indent}            <span data-slot="select-value" className="pointer-events-no
 ${indent}              {(${selectedLabelExpression}) ?? ${stringify}}
 ${indent}            </span>
 ${indent}          </SelectTrigger>
-${indent}          <SelectContent position="popper" align="start">
+${indent}          <SelectContent alignItemWithTrigger={false} align="start">
 ${optionsJsx}
 ${indent}          </SelectContent>
 ${indent}        </Select>
@@ -18552,9 +18532,10 @@ ${indent}    return (
 ${indent}      <FormItem${formItemProps2}>
 ${indent}        ${labelWithDescription2}
 ${indent}        <Popover open={${openVar}} onOpenChange={${setOpenVar}}>
-${indent}          <PopoverTrigger asChild>
-${indent}            <FormControl>
-${indent}              <Button
+${indent}          <PopoverTrigger
+${indent}            render={
+${indent}              <FormControl>
+${indent}                <Button
 ${indent}                type="button"
 ${indent}                variant="outline"
 ${indent}                role="combobox"
@@ -18563,13 +18544,14 @@ ${indent}                className={cn("w-full justify-between", {
 ${indent}                  "text-muted-foreground": !selectedOption
 ${indent}                })}
 ${indent}                disabled={isPending}
-${indent}              >
-${indent}                <span className="truncate">{selectedOption?.label ?? ${stringify}}</span>
-${indent}                <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
-${indent}              </Button>
-${indent}            </FormControl>
-${indent}          </PopoverTrigger>
-${indent}          <PopoverContent className="w-(--radix-popover-trigger-width) p-0" align="start">
+${indent}                >
+${indent}                  <span className="truncate">{selectedOption?.label ?? ${stringify}}</span>
+${indent}                  <ChevronsUpDown className="ml-2 size-4 shrink-0 opacity-50" />
+${indent}                </Button>
+${indent}              </FormControl>
+${indent}            }
+${indent}          />
+${indent}          <PopoverContent className="w-(--anchor-width) p-0" align="start">
 ${indent}            <Command>
 ${indent}              <CommandInput
 ${indent}                placeholder="Search ${lowerLabel}..."
@@ -18759,18 +18741,19 @@ ${indent}    return (
 ${indent}      <FormItem${formItemProps2}>
 ${indent}        ${labelWithDescription2}
 ${indent}        <Popover open={${openVar}} onOpenChange={${setOpenVar}}>
-${indent}          <PopoverTrigger asChild>
-${indent}            <FormControl>
-${indent}              <Button
-${indent}                type="button"
-${indent}                variant="outline"
-${indent}                role="combobox"
-${indent}                aria-expanded={${openVar}}
-${indent}                className={cn("w-full justify-between gap-2", {
-${indent}                  "text-muted-foreground": selectedOptions.length === 0
-${indent}                })}
-${indent}                disabled={isPending}
-${indent}              >
+${indent}          <PopoverTrigger
+${indent}            render={
+${indent}              <FormControl>
+${indent}                <Button
+${indent}                  type="button"
+${indent}                  variant="outline"
+${indent}                  role="combobox"
+${indent}                  aria-expanded={${openVar}}
+${indent}                  className={cn("w-full justify-between gap-2", {
+${indent}                    "text-muted-foreground": selectedOptions.length === 0
+${indent}                  })}
+${indent}                  disabled={isPending}
+${indent}                >
 ${indent}                <span className="flex min-w-0 flex-1 items-center gap-2 text-left">
 ${indent}                  {selectedOptions.length > 0 ? (
 ${indent}                    <>
@@ -18779,15 +18762,12 @@ ${indent}                        {visibleSelectedOptions.map((option) => option.
 ${indent}                      </span>
 ${indent}                      {hiddenSelectedOptions.length > 0 ? (
 ${indent}                        <Tooltip>
-${indent}                          <TooltipTrigger asChild>
-${indent}                            <Badge
-${indent}                              variant="outline"
-${indent}                              className="h-5 shrink-0 tabular-nums"
-${indent}                            >
+${indent}                          <TooltipTrigger
+${indent}                            render={<Badge variant="outline" className="h-5 shrink-0 tabular-nums" />}
+${indent}                          >
 ${indent}                              {'+'}
 ${indent}                              {hiddenSelectedOptions.length}{' '}
 ${indent}                              {hiddenSelectedOptions.length === 1 ? 'other' : 'others'}
-${indent}                            </Badge>
 ${indent}                          </TooltipTrigger>
 ${indent}                          <TooltipContent align="center" side="bottom" className="max-w-60 w-full">
 ${indent}                            <div className="space-y-1">
@@ -18806,10 +18786,11 @@ ${indent}                    <span className="truncate">{${stringify}}</span>
 ${indent}                  )}
 ${indent}                </span>
 ${indent}                <ChevronsUpDown className="size-4 shrink-0 opacity-50" />
-${indent}              </Button>
-${indent}            </FormControl>
-${indent}          </PopoverTrigger>
-${indent}          <PopoverContent className="w-(--radix-popover-trigger-width) p-0" align="start">
+${indent}                </Button>
+${indent}              </FormControl>
+${indent}            }
+${indent}          />
+${indent}          <PopoverContent className="w-(--anchor-width) p-0" align="start">
 ${indent}            <Command>
 ${indent}              ${searchInput}
 ${indent}              <CommandList>
@@ -20955,10 +20936,8 @@ function renderPageContentActionButtonsTemplate2({
   schemaName,
   singularizeLabel: singularizeLabel2
 }) {
-  return `<Button asChild>
-              <Link href="${adminRoutePath}/${schemaName}/new">
-                Create ${singularizeLabel2}
-              </Link>
+  return `<Button render={<Link href="${adminRoutePath}/${schemaName}/new" />}>
+              Create ${singularizeLabel2}
             </Button>`;
 }
 function renderPageContentActionButtonsDetailsTemplate() {
@@ -31409,6 +31388,26 @@ function scaffoldComponents({ cwd, config }) {
     "components/shared/data-table/data-grid.tsx",
     readTemplate("components/shared/data-table/data-grid.tsx")
   );
+  write(
+    "components/shared/data-table/data-grid-header.tsx",
+    readTemplate("components/shared/data-table/data-grid-header.tsx")
+  );
+  write(
+    "components/shared/data-table/data-grid-body.tsx",
+    readTemplate("components/shared/data-table/data-grid-body.tsx")
+  );
+  write(
+    "components/shared/data-table/data-grid-row.tsx",
+    readTemplate("components/shared/data-table/data-grid-row.tsx")
+  );
+  write(
+    "components/shared/data-table/data-grid-head.tsx",
+    readTemplate("components/shared/data-table/data-grid-head.tsx")
+  );
+  write(
+    "components/shared/data-table/data-grid-cell.tsx",
+    readTemplate("components/shared/data-table/data-grid-cell.tsx")
+  );
   write(
     "components/shared/data-table/data-table-pagination.tsx",
     readTemplate("components/shared/data-table/data-table-pagination.tsx")
@@ -33054,6 +33053,7 @@ function scaffoldOxfmt(cwd, linter, adminDir) {
     },
     rules: {
       "react/react-in-jsx-scope": "off",
+      "react/no-multi-comp": "error",
       "typescript/no-non-null-assertion": "off",
       // Inline `type` specifiers become their own `import type` statement, which
       // oxfmt then hoists via the `type` group above.
@@ -33072,6 +33072,12 @@ function scaffoldOxfmt(cwd, linter, adminDir) {
           "unicorn/no-new-array": "off",
           "unicorn/no-empty-file": "off"
         }
+      },
+      {
+        files: [`**/${admin}/components/ui/**`],
+        rules: {
+          "react/no-multi-comp": "off"
+        }
       }
     ],
     ignorePatterns: IGNORE_PATTERNS
@@ -36589,7 +36595,34 @@ var TEMPLATE_REGISTRY = {
   },
   "data-grid": {
     relPath: "components/shared/data-table/data-grid.tsx",
-    content: () => readTemplate("components/shared/data-table/data-grid.tsx")
+    content: () => readTemplate("components/shared/data-table/data-grid.tsx"),
+    dependencies: [
+      "data-grid-header",
+      "data-grid-body",
+      "data-grid-row",
+      "data-grid-head",
+      "data-grid-cell"
+    ]
+  },
+  "data-grid-header": {
+    relPath: "components/shared/data-table/data-grid-header.tsx",
+    content: () => readTemplate("components/shared/data-table/data-grid-header.tsx")
+  },
+  "data-grid-body": {
+    relPath: "components/shared/data-table/data-grid-body.tsx",
+    content: () => readTemplate("components/shared/data-table/data-grid-body.tsx")
+  },
+  "data-grid-row": {
+    relPath: "components/shared/data-table/data-grid-row.tsx",
+    content: () => readTemplate("components/shared/data-table/data-grid-row.tsx")
+  },
+  "data-grid-head": {
+    relPath: "components/shared/data-table/data-grid-head.tsx",
+    content: () => readTemplate("components/shared/data-table/data-grid-head.tsx")
+  },
+  "data-grid-cell": {
+    relPath: "components/shared/data-table/data-grid-cell.tsx",
+    content: () => readTemplate("components/shared/data-table/data-grid-cell.tsx")
   },
   "data-table-pagination": {
     relPath: "components/shared/data-table/data-table-pagination.tsx",
@@ -40209,7 +40242,8 @@ function createAdminShadcnComponentsJson(config) {
   const namespace = resolveAdminNamespace(config.frameworkConfig.next.namespace);
   return {
     $schema: "https://ui.shadcn.com/schema.json",
-    style: "new-york",
+    base: "base",
+    style: "maia",
     rsc: true,
     tsx: true,
     tailwind: {