betterstart-cli 0.0.106 → 0.0.108

package/dist/cli.js

@@ -83,7 +83,7 @@ import {
   trimDotSlash,
   usesIdentifier,
   validateAdminNamespace
-} from "./chunk-OYU73Q2W.js";
+} from "./chunk-PSDUGFMD.js";
 
 // cli.ts
 import * as p66 from "@clack/prompts";
@@ -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",
@@ -2821,13 +2794,10 @@ var REACT_ADMIN_DEPS = [
   "katex",
   "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]));
@@ -2881,7 +2851,6 @@ var STATIC_CUSTOM_DEPENDENCIES = {
     "use-content-editor-source-mode",
     "use-content-editor-mobile-toolbar",
     "use-content-editor-slash-menu",
-    "use-admin-theme",
     "use-mobile",
     "tiptap",
     "tiptap-utils"
@@ -6313,12 +6282,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 +6376,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 +6900,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 +7198,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>
@@ -13466,7 +13441,7 @@ function renderLinkColumnCell({ columnAccessorKey }) {
           href={value}
           target="_blank"
           rel="noopener noreferrer"
-          className="text-sm text-blue-600 hover:text-blue-800 hover:underline dark:text-blue-400 dark:hover:text-blue-300"
+          className="text-sm text-blue-600 hover:text-blue-800 hover:underline"
           title={value}
         >
           {truncateText(value, 50)}
@@ -14231,7 +14206,7 @@ function renderFirstColumnDefClickHandlerTemplate({
               href={value}
               target="_blank"
               rel="noopener noreferrer"
-              className="text-sm text-blue-600 hover:text-blue-800 hover:underline dark:text-blue-400 dark:hover:text-blue-300 truncate block max-w-[250px]"
+              className="text-sm text-blue-600 hover:text-blue-800 hover:underline truncate block max-w-[250px]"
               title={value}
               onClick={(e) => e.stopPropagation()}
             >
@@ -16936,18 +16911,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 +18135,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 +18242,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 +18475,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 +18530,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 +18542,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 +18739,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 +18760,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 +18784,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 +20934,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() {
@@ -31692,7 +31669,6 @@ function scaffoldComponents({ cwd, config }) {
     "utils/table/default-get-id.ts",
     "utils/table/is-string.ts",
     "utils/text/text.ts",
-    "utils/theme/system.ts",
     "utils/upload/default-remote-accept.ts",
     "utils/upload/dropzone-accept.ts",
     "utils/upload/get-fallback-extension.ts",
@@ -31796,7 +31772,6 @@ function scaffoldComponents({ cwd, config }) {
   write("hooks/use-copy-to-clipboard.ts", readTemplate("hooks/use-copy-to-clipboard.ts"));
   write("hooks/use-dev-mode-integration.ts", readTemplate("hooks/use-dev-mode-integration.ts"));
   write("hooks/use-local-storage.ts", readTemplate("hooks/use-local-storage.ts"));
-  write("hooks/use-admin-theme.tsx", readTemplate("hooks/use-admin-theme.tsx"));
   write("hooks/use-audit-log.ts", readTemplate("hooks/use-audit-log.ts"));
   write("hooks/use-users.ts", readTemplate("hooks/use-users.ts"));
   write("hooks/use-webhooks.ts", readTemplate("hooks/use-webhooks.ts"));
@@ -32445,6 +32420,7 @@ function renderCreateNextConfigTemplateImportsTemplate({
 
 const nextConfig: NextConfig = {
   cacheComponents: true,
+  partialPrefetching: true,
   devIndicators: false,
   images: {
     remotePatterns: [
@@ -32906,6 +32882,11 @@ ${propertyIndent}useCache: true,` + updatedContent.slice(experimentalObjectStart
   };
 }
 
+// adapters/next/init/scaffolders/next-config/ensure-partial-prefetching.ts
+function ensurePartialPrefetching(content, configObject) {
+  return upsertTopLevelBooleanProperty(content, configObject, "partialPrefetching");
+}
+
 // adapters/next/init/scaffolders/next-config/resolve-cache-config-mode.ts
 function resolveCacheConfigMode(nextMajorVersion) {
   if (nextMajorVersion >= 16) return "cache-components";
@@ -32945,18 +32926,32 @@ function scaffoldNextConfig({
   if (cacheUpdateResult.unsupported) {
     return { status: "unsupported" };
   }
-  const updatedConfigObject = findConfigObject(cacheUpdateResult.content);
+  let updatedContent = cacheUpdateResult.content;
+  let changed = cacheUpdateResult.changed;
+  if (cacheConfigMode === "cache-components") {
+    const cacheConfigObject = findConfigObject(updatedContent);
+    if (!cacheConfigObject) {
+      return { status: "unsupported" };
+    }
+    const partialPrefetchingUpdateResult = ensurePartialPrefetching(
+      updatedContent,
+      cacheConfigObject
+    );
+    if (partialPrefetchingUpdateResult.unsupported) {
+      return { status: "unsupported" };
+    }
+    updatedContent = partialPrefetchingUpdateResult.content;
+    changed ||= partialPrefetchingUpdateResult.changed;
+  }
+  const updatedConfigObject = findConfigObject(updatedContent);
   if (!updatedConfigObject) {
     return { status: "unsupported" };
   }
-  const imagesUpdateResult = ensureBetterStartImageHost(
-    cacheUpdateResult.content,
-    updatedConfigObject
-  );
+  const imagesUpdateResult = ensureBetterStartImageHost(updatedContent, updatedConfigObject);
   if (imagesUpdateResult.unsupported) {
     return { status: "unsupported" };
   }
-  const changed = cacheUpdateResult.changed || imagesUpdateResult.changed;
+  changed ||= imagesUpdateResult.changed;
   if (!changed) {
     return { status: "already-set" };
   }
@@ -35728,7 +35723,7 @@ async function runInitCommandInternal(name, options, jsonContext) {
   const drizzleConfigPath = path91.join(cwd, "drizzle.config.ts");
   if (!dbFiles.includes("drizzle.config.ts") && fs78.existsSync(drizzleConfigPath)) {
     if (forceMode) {
-      const { readNamespacedTemplate } = await import("./read-namespaced-template-EIH2NPDJ.js");
+      const { readNamespacedTemplate } = await import("./read-namespaced-template-TSATYQPP.js");
       fs78.writeFileSync(
         drizzleConfigPath,
         readNamespacedTemplate("drizzle.config.ts", namespace),
@@ -35741,7 +35736,7 @@ async function runInitCommandInternal(name, options, jsonContext) {
         initialValue: true
       });
       if (!p61.isCancel(overwrite) && overwrite) {
-        const { readNamespacedTemplate } = await import("./read-namespaced-template-EIH2NPDJ.js");
+        const { readNamespacedTemplate } = await import("./read-namespaced-template-TSATYQPP.js");
         fs78.writeFileSync(
           drizzleConfigPath,
           readNamespacedTemplate("drizzle.config.ts", namespace),
@@ -36435,8 +36430,7 @@ var TEMPLATE_REGISTRY = {
       "dev-mode-plain-code-fallback",
       "dev-mode-types",
       "tabs",
-      "use-copy-to-clipboard",
-      "use-admin-theme"
+      "use-copy-to-clipboard"
     ]
   },
   "dev-mode-code-mirror": {
@@ -36658,7 +36652,6 @@ var TEMPLATE_REGISTRY = {
     content: () => readTemplate("hooks/content-editor/use-content-editor-source-mode.tsx"),
     dependencies: [
       "media-field",
-      "use-admin-theme",
       "markdown-utils",
       "content-editor-source-media-utils",
       "tiptap-utils"
@@ -36788,11 +36781,6 @@ var TEMPLATE_REGISTRY = {
     relPath: "hooks/use-local-storage.ts",
     content: () => readTemplate("hooks/use-local-storage.ts")
   },
-  "use-admin-theme": {
-    relPath: "hooks/use-admin-theme.tsx",
-    content: () => readTemplate("hooks/use-admin-theme.tsx"),
-    dependencies: ["theme-system-utils"]
-  },
   "use-audit-log": {
     relPath: "hooks/use-audit-log.ts",
     content: () => readTemplate("hooks/use-audit-log.ts"),
@@ -37817,10 +37805,6 @@ var TEMPLATE_REGISTRY = {
     relPath: "utils/text/text.ts",
     content: () => readTemplate("utils/text/text.ts")
   },
-  "theme-system-utils": {
-    relPath: "utils/theme/system.ts",
-    content: () => readTemplate("utils/theme/system.ts")
-  },
   "upload-default-remote-accept": {
     relPath: "utils/upload/default-remote-accept.ts",
     content: () => readTemplate("utils/upload/default-remote-accept.ts")
@@ -40263,7 +40247,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: {