betterstart-cli 0.0.20 → 0.0.22

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

@@ -62,7 +62,7 @@ export function DevModeIntegrateButton({
         </DrawerHeader>
 
         {loadedIntegration ? (
-          <Tabs defaultValue="snippets" className="min-h-0 flex-1 overflow-hidden px-4 pb-4 gap-4">
+          <Tabs defaultValue="snippets" className="min-h-0 flex-1 overflow-hidden px-6 pb-4 gap-4">
             <TabsList className="w-full">
               <TabsTrigger value="snippets">Snippets</TabsTrigger>
               <TabsTrigger value="lifecycle-hooks">Lifecycle Hooks</TabsTrigger>

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

@@ -95,7 +95,7 @@ export function EditMediaDialogContent({
         ref={handleDrawerContainerRef}
         className="pointer-events-none absolute inset-3 z-20 overflow-hidden rounded-lg"
       />
-      <div className="relative z-10 flex min-h-0 flex-1 flex-col overflow-hidden">
+      <div className="relative z-10 flex min-h-0 flex-1 flex-col overflow-hidden gap-3">
         <DrawerHeader>
           <DrawerTitle>Media file</DrawerTitle>
         </DrawerHeader>
@@ -103,7 +103,7 @@ export function EditMediaDialogContent({
           <form
             id={formId}
             onSubmit={form.handleSubmit(handleSave)}
-            className="flex flex-1 flex-col gap-4 overflow-y-auto px-4 pb-4 pt-px"
+            className="flex flex-1 flex-col gap-4 overflow-y-auto px-6 pb-4 pt-px"
           >
             <Card>
               <CardContent className="p-0">

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

@@ -194,7 +194,7 @@ export function SortOrderDialog({
         onAnimationEnd={handleDrawerAnimationEnd}
       >
         <DrawerContent className="h-full w-full overflow-hidden">
-          <div className="relative z-10 flex min-h-0 flex-1 flex-col overflow-hidden">
+          <div className="relative z-10 flex min-h-0 flex-1 flex-col overflow-hidden gap-3">
             <DrawerHeader>
               <DrawerTitle>{title}</DrawerTitle>
               {description ? <DrawerDescription>{description}</DrawerDescription> : null}
@@ -205,7 +205,7 @@ export function SortOrderDialog({
               </div>
             ) : (
               <ScrollArea className="min-h-0 flex-1">
-                <div className="flex flex-col gap-1 px-4 py-1">
+                <div className="flex flex-col gap-1 px-6 py-1">
                   <SortableContext
                     items={orderedItems.map((i) => i.id)}
                     strategy={verticalListSortingStrategy}

package/dist/assets/adapters/next/templates/init/components/shared/sort-order-drag-overlay-item.tsx

@@ -9,7 +9,7 @@ export function DragOverlayItem({ label }: { label: string }) {
       className="shrink-0 w-full justify-start gap-2 px-2 font-normal touch-none cursor-grabbing"
     >
       <GripVertical strokeWidth={1} />
-      <span className="truncate text-sm">{label}</span>
+      <span className="min-w-0 truncate text-sm">{label}</span>
     </Button>
   )
 }

package/dist/assets/adapters/next/templates/init/components/shared/sort-order-item.tsx

@@ -25,7 +25,7 @@ export function SortableItem({ id, label }: SortOrderItemData) {
         {...listeners}
       >
         <GripVertical strokeWidth={1} />
-        <span className="truncate text-sm">{label}</span>
+        <span className="min-w-0 truncate text-sm">{label}</span>
       </Button>
     </div>
   )

package/dist/assets/adapters/next/templates/init/pages/audit-log/audit-log-page-content.tsx

@@ -21,7 +21,7 @@ import { useAuditLogs, useCleanupAuditLogs } from '@admin/hooks/use-audit-log'
 import { useTableUtils } from '@admin/hooks/use-table-utils'
 import { cn } from '@admin/utils/shared/cn'
 import { type ColumnDef, flexRender, getCoreRowModel, useReactTable } from '@tanstack/react-table'
-import { GripVertical, LoaderCircle, Trash2 } from 'lucide-react'
+import { GripVertical } from 'lucide-react'
 import { parseAsInteger, parseAsString, useQueryStates } from 'nuqs'
 import * as React from 'react'
 import { toast } from 'sonner'
@@ -341,7 +341,7 @@ export function AuditLogPageContent() {
     })
   }, [setFilters])
 
-  const runCleanup = React.useCallback(() => {
+  const _runCleanup = React.useCallback(() => {
     cleanupMutation.mutate(undefined, {
       onSuccess: (result) => {
         if (!result.success) {
@@ -386,22 +386,7 @@ export function AuditLogPageContent() {
 
   return (
     <React.Fragment>
-      <PageHeader
-        title="Audit Log"
-        actions={
-          <div className="flex items-center gap-1">
-            <Button
-              type="button"
-              variant="outline"
-              disabled={cleanupMutation.isPending}
-              onClick={runCleanup}
-            >
-              {cleanupMutation.isPending ? <LoaderCircle className="animate-spin" /> : <Trash2 />}
-              Cleanup
-            </Button>
-          </div>
-        }
-      />
+      <PageHeader title="Audit Log" />
 
       <EntityFiltersBar
         filters={filtersConfig}

package/dist/assets/shared-assets/react-admin/custom/content-editor/index.tsx

@@ -136,7 +136,7 @@ export function ContentEditor({
                 <EditorContent
                   editor={editor}
                   role="presentation"
-                  className="simple-editor-content min-h-0 flex-1 cursor-text p-10 overflow-y-auto bg-background [&_.ProseMirror]:min-h-full"
+                  className="simple-editor-content min-h-0 flex-1 cursor-text p-10 overflow-y-auto bg-input [&_.ProseMirror]:min-h-full"
                 />
               </div>
             </>

package/dist/assets/shared-assets/react-admin/custom/content-editor/source-mode.tsx

@@ -346,7 +346,7 @@ export function SourceMode({
             highlightActiveLineGutter: false
           }}
           className={cn(
-            'flex min-h-0 flex-1 flex-col overflow-hidden font-mono text-sm font-normal leading-6 [&_.cm-content]:!bg-transparent [&_.cm-editor]:!bg-background [&_.cm-gutters]:!bg-background [&_.cm-scroller]:!bg-background',
+            'flex min-h-0 flex-1 flex-col overflow-hidden font-mono text-sm font-normal leading-6 [&_.cm-content]:!bg-transparent [&_.cm-editor]:!bg-input [&_.cm-gutters]:!bg-input [&_.cm-scroller]:!bg-input',
             {
               'opacity-50 cursor-not-allowed': disabled
             }

package/dist/assets/shared-assets/react-admin/ui/scroll-area.tsx

@@ -17,7 +17,7 @@ function ScrollArea({
     >
       <ScrollAreaPrimitive.Viewport
         data-slot="scroll-area-viewport"
-        className="size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1"
+        className="size-full rounded-[inherit] transition-[color,box-shadow] outline-none [&>div]:block! focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-1"
       >
         {children}
       </ScrollAreaPrimitive.Viewport>

package/dist/cli.js

@@ -3056,7 +3056,7 @@ async function resolvePasswordEnvValue(options) {
   options.overwriteEnvKeys.add(options.key);
   return result.trim();
 }
-async function promptResendConfig(cwd) {
+async function collectResendConfig(cwd) {
   const overwriteEnvKeys = /* @__PURE__ */ new Set();
   const apiKey = await resolvePasswordEnvValue({
     cwd,
@@ -3083,9 +3083,8 @@ async function promptResendConfig(cwd) {
       }
     }
   });
-  const envResult = appendEnvVars(
-    cwd,
-    [
+  return {
+    sections: [
       {
         header: "Email (Resend)",
         vars: [
@@ -3094,15 +3093,19 @@ async function promptResendConfig(cwd) {
         ]
       }
     ],
-    overwriteEnvKeys
-  );
+    overwriteKeys: overwriteEnvKeys
+  };
+}
+async function promptResendConfig(cwd) {
+  const collected = await collectResendConfig(cwd);
+  const envResult = appendEnvVars(cwd, collected.sections, collected.overwriteKeys);
   return {
     configured: true,
     addedEnvKeys: envResult.added,
     updatedEnvKeys: envResult.updated
   };
 }
-async function promptR2Config(cwd) {
+async function collectR2Config(cwd) {
   const overwriteEnvKeys = /* @__PURE__ */ new Set();
   const accountId = await resolveTextEnvValue({
     cwd,
@@ -3117,7 +3120,7 @@ async function promptR2Config(cwd) {
   const accessKeyId = await resolveTextEnvValue({
     cwd,
     key: "BETTERSTART_R2_ACCESS_KEY_ID",
-    message: "R2 access key ID",
+    message: "Cloudflare R2 access key ID",
     cancelMessage: "R2 configuration cancelled.",
     overwriteEnvKeys,
     validate(value) {
@@ -3127,7 +3130,7 @@ async function promptR2Config(cwd) {
   const secretAccessKey = await resolvePasswordEnvValue({
     cwd,
     key: "BETTERSTART_R2_SECRET_ACCESS_KEY",
-    message: "R2 secret access key",
+    message: "Cloudflare R2 secret access key",
     cancelMessage: "R2 configuration cancelled.",
     overwriteEnvKeys,
     validate(value) {
@@ -3137,7 +3140,7 @@ async function promptR2Config(cwd) {
   const bucketName = await resolveTextEnvValue({
     cwd,
     key: "BETTERSTART_R2_BUCKET_NAME",
-    message: "R2 bucket name",
+    message: "Cloudflare R2 bucket name",
     defaultValue: "betterstart-uploads",
     cancelMessage: "R2 configuration cancelled.",
     overwriteEnvKeys,
@@ -3148,7 +3151,7 @@ async function promptR2Config(cwd) {
   const publicUrl = await resolveTextEnvValue({
     cwd,
     key: "BETTERSTART_R2_PUBLIC_URL",
-    message: "R2 public URL",
+    message: "Cloudflare R2 public URL",
     cancelMessage: "R2 configuration cancelled.",
     overwriteEnvKeys,
     validate(value) {
@@ -3157,9 +3160,8 @@ async function promptR2Config(cwd) {
       }
     }
   });
-  const envResult = appendEnvVars(
-    cwd,
-    [
+  return {
+    sections: [
       {
         header: "Storage (Cloudflare R2)",
         vars: [
@@ -3171,14 +3173,34 @@ async function promptR2Config(cwd) {
         ]
       }
     ],
-    overwriteEnvKeys
-  );
+    overwriteKeys: overwriteEnvKeys
+  };
+}
+async function promptR2Config(cwd) {
+  const collected = await collectR2Config(cwd);
+  const envResult = appendEnvVars(cwd, collected.sections, collected.overwriteKeys);
   return {
     configured: true,
     addedEnvKeys: envResult.added,
     updatedEnvKeys: envResult.updated
   };
 }
+async function collectIntegrationConfig(cwd, integrationIds) {
+  const sections = [];
+  const overwriteKeys = /* @__PURE__ */ new Set();
+  for (const integrationId of resolveIntegrationInstallOrder(integrationIds)) {
+    const definition = getIntegrationDefinition(integrationId);
+    const collected = definition.configure === "resend" ? await collectResendConfig(cwd) : definition.configure === "r2" ? await collectR2Config(cwd) : void 0;
+    if (!collected) {
+      continue;
+    }
+    sections.push(...collected.sections);
+    for (const key of collected.overwriteKeys) {
+      overwriteKeys.add(key);
+    }
+  }
+  return { sections, overwriteKeys };
+}
 async function configureIntegration(definition, cwd, interactive) {
   if (definition.configure === "resend") {
     if (interactive) {
@@ -21081,7 +21103,32 @@ function openBrowser(url) {
 // adapters/next/init/prompts/plugins.ts
 import { styleText } from "util";
 import * as p8 from "@clack/prompts";
-async function promptPlugins() {
+async function promptPlugins(cwd) {
+  const sections = [];
+  const overwriteKeys = /* @__PURE__ */ new Set();
+  const mergeIntegrationConfig = (collected) => {
+    sections.push(...collected.sections);
+    for (const key of collected.overwriteKeys) {
+      overwriteKeys.add(key);
+    }
+  };
+  const selectedPlugins = await p8.multiselect({
+    message: `Select presets
+${styleText("dim", "Press [Spacebar] to select/unselect")}`,
+    options: [
+      {
+        value: "blog",
+        label: "Blog",
+        hint: "Posts"
+      }
+    ],
+    required: false,
+    initialValues: ["blog"]
+  });
+  if (p8.isCancel(selectedPlugins)) {
+    p8.cancel("Setup cancelled.");
+    process.exit(0);
+  }
   const storage = await p8.select({
     message: "Choose a file storage mode",
     options: [
@@ -21102,22 +21149,8 @@ async function promptPlugins() {
     p8.cancel("Setup cancelled.");
     process.exit(0);
   }
-  const selectedPlugins = await p8.multiselect({
-    message: `Select presets
-${styleText("dim", "Press [Spacebar] to select/unselect")}`,
-    options: [
-      {
-        value: "blog",
-        label: "Blog",
-        hint: "Posts"
-      }
-    ],
-    required: false,
-    initialValues: ["blog"]
-  });
-  if (p8.isCancel(selectedPlugins)) {
-    p8.cancel("Setup cancelled.");
-    process.exit(0);
+  if (storage === "r2") {
+    mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["r2"]));
   }
   const selectedEmailProvider = await p8.select({
     message: `Which email provider do you want to set up?
@@ -21146,12 +21179,19 @@ ${styleText(
     p8.cancel("Setup cancelled.");
     process.exit(0);
   }
-  const selectedIntegrations = selectedEmailProvider === "resend" ? ["resend"] : [];
-  const integrations = storage === "r2" ? [...selectedIntegrations, "r2"] : selectedIntegrations;
+  const integrations = [];
+  if (selectedEmailProvider === "resend") {
+    integrations.push("resend");
+    mergeIntegrationConfig(await collectIntegrationConfig(cwd, ["resend"]));
+  }
+  if (storage === "r2") {
+    integrations.push("r2");
+  }
   return {
     plugins: selectedPlugins,
     integrations,
-    storage
+    storage,
+    integrationConfig: { sections, overwriteKeys }
   };
 }
 
@@ -23610,15 +23650,28 @@ async function runInitCommand(name, options) {
     }
     return [];
   })();
-  const pluginSelection = selectedPlugins.length > 0 || selectedIntegrations.length > 0 ? {
-    plugins: selectedPlugins,
-    integrations: selectedIntegrations,
-    storage: selectedIntegrations.includes("r2") ? "r2" : "local"
-  } : options.yes ? {
-    plugins: [],
-    integrations: [],
-    storage: "local"
-  } : await promptPlugins();
+  let collectedIntegrationConfig = {
+    sections: [],
+    overwriteKeys: /* @__PURE__ */ new Set()
+  };
+  let pluginSelection;
+  if (selectedPlugins.length > 0 || selectedIntegrations.length > 0) {
+    pluginSelection = {
+      plugins: selectedPlugins,
+      integrations: selectedIntegrations,
+      storage: selectedIntegrations.includes("r2") ? "r2" : "local"
+    };
+  } else if (options.yes) {
+    pluginSelection = { plugins: [], integrations: [], storage: "local" };
+  } else {
+    const promptResult = await promptPlugins(cwd);
+    collectedIntegrationConfig = promptResult.integrationConfig;
+    pluginSelection = {
+      plugins: promptResult.plugins,
+      integrations: promptResult.integrations,
+      storage: promptResult.storage
+    };
+  }
   let databaseUrl;
   const existingDbUrl = readExistingDbUrl(cwd);
   if (options.yes) {
@@ -23678,6 +23731,13 @@ async function runInitCommand(name, options) {
   });
   s.message("Environment variables");
   const envResult = scaffoldEnv(cwd, { databaseUrl, namespace });
+  if (collectedIntegrationConfig.sections.length > 0) {
+    appendEnvVars(
+      cwd,
+      collectedIntegrationConfig.sections,
+      collectedIntegrationConfig.overwriteKeys
+    );
+  }
   const envCount = envResult.added.length + envResult.updated.length;
   results.push({
     label: "Environment variables",
@@ -23806,7 +23866,9 @@ async function runInitCommand(name, options) {
       config: resolvedPluginInstallResult.config,
       pm,
       integrationIds: pluginSelection.integrations,
-      interactive: !options.yes,
+      // Secrets were already collected up front and written to .env.local,
+      // so the install runs without prompting (rule: no mid-scaffold input).
+      interactive: false,
       includeBiome: project2.linter.type === "none"
     });
   })() : Promise.resolve({