betterstart-cli 0.0.19 → 0.0.21

package/dist/assets/adapters/next/plugins/portfolio/schemas/portfolio.json

@@ -123,6 +123,6 @@
     "draft": true
   },
   "search": {
-    "fields": ["title", "excerpt"]
+    "fields": ["title"]
   }
 }

package/dist/assets/adapters/next/templates/init/data/navigation.ts

@@ -1,5 +1,6 @@
 import type { AdminNavigationItem } from '@admin/types/navigation'
 import { House, ImagePlay } from 'lucide-react'
+import { contactNav } from './navigation/contact'
 import { menusNav } from './navigation/menus'
 import { portfolioNav } from './navigation/portfolio'
 import { postsNav } from './navigation/posts'
@@ -30,7 +31,7 @@ function comparePositions(a?: number, b?: number): number {
   return 0
 }
 
-const combinedNavigation = [...coreNav, ...menusNav, ...portfolioNav, ...postsNav]
+const combinedNavigation = [...coreNav, ...contactNav, ...menusNav, ...portfolioNav, ...postsNav]
 
 const dashboard = combinedNavigation.find((item) => item.href === '/admin')
 const others = combinedNavigation.filter((item) => item.href !== '/admin')

package/dist/assets/shared-assets/react-admin/custom/gallery-field.tsx

@@ -195,7 +195,7 @@ export function GalleryField({
               <CarouselContent className="-ml-3">
                 {canAdd && !disabled ? (
                   <CarouselItem className="basis-[168px] pl-3 sm:basis-[184px]">
-                    <Card className="h-full">
+                    <Card className="h-full" onClick={() => setOpen(true)}>
                       <CardContent className="p-2 flex flex-col cursor-pointer">
                         <div className="flex size-full bg-background border border-border rounded-sm aspect-square overflow-hidden text-muted-foreground hover:text-foreground transition-colors items-center flex-col justify-center gap-1">
                           <Plus className="size-6" strokeWidth={1.5} />

package/dist/assets/shared-assets/react-admin/custom/media-field-empty-state.tsx

@@ -6,39 +6,27 @@ import { Card, CardContent } from '@admin/components/ui/card'
 import type { AdminMedia } from '@admin/types'
 import { cn } from '@admin/utils/shared/cn'
 import { ImageIcon } from 'lucide-react'
-import type * as React from 'react'
 
 interface MediaFieldEmptyStateProps {
   accept?: string
-  addButtonLabel?: string
   className?: string
   disabled?: boolean
-  isRemovable?: boolean
   mode?: 'single' | 'multi'
   open: boolean
   onOpenChange: (open: boolean) => void
-  onRemove?: React.MouseEventHandler<HTMLButtonElement>
   onSelect: (selected: AdminMedia | AdminMedia[]) => void
-  showAddButton?: boolean
 }
 
 export function MediaFieldEmptyState({
   accept,
-  addButtonLabel = 'Add Image',
   className,
   disabled,
-  isRemovable = false,
   mode = 'single',
   open,
   onOpenChange,
-  onRemove,
-  onSelect,
-  showAddButton = false
+  onSelect
 }: MediaFieldEmptyStateProps) {
-  const shouldShowAddButton = showAddButton || isRemovable
-  const shouldShowActions = !disabled && (shouldShowAddButton || onRemove)
-
-  function handleAddImage(e: React.MouseEvent) {
+  function handleAddImage(e: React.MouseEvent<HTMLButtonElement>) {
     e.preventDefault()
     e.stopPropagation()
     onOpenChange(true)
@@ -54,36 +42,20 @@ export function MediaFieldEmptyState({
       >
         <CardContent className="relative p-0 justify-center items-center flex flex-col h-40 hover:bg-muted/50 transition-colors duration-200">
           <ImageIcon
-            className={cn('text-muted-foreground transition-opacity', {
-              'group-hover:opacity-0 group-focus-within:opacity-0': shouldShowActions
-            })}
+            className="text-muted-foreground transition-opacity group-hover:opacity-0 group-focus-within:opacity-0"
             strokeWidth={1}
           />
-          {shouldShowActions && (
-            <div className="absolute inset-0 flex items-center justify-center gap-1 opacity-0 transition-opacity duration-200 ease-out group-hover:opacity-100 group-focus-within:opacity-100">
-              {shouldShowAddButton ? (
-                <Button
-                  type="button"
-                  data-media-field-action="true"
-                  variant="outline"
-                  onClick={handleAddImage}
-                  className="border-primary/10"
-                >
-                  {addButtonLabel}
-                </Button>
-              ) : null}
-              {onRemove ? (
-                <Button
-                  type="button"
-                  data-media-field-action="true"
-                  variant="default"
-                  onClick={onRemove}
-                >
-                  Remove
-                </Button>
-              ) : null}
-            </div>
-          )}
+          <div className="absolute inset-0 flex items-center justify-center gap-1 opacity-0 transition-opacity duration-200 ease-out group-hover:opacity-100 group-focus-within:opacity-100">
+            <Button
+              type="button"
+              data-media-field-action="true"
+              variant="outline"
+              onClick={handleAddImage}
+              className="border-primary/10"
+            >
+              Add Image
+            </Button>
+          </div>
         </CardContent>
       </Card>
 

package/dist/assets/shared-assets/react-admin/custom/media-field.tsx

@@ -174,7 +174,6 @@ export function MediaField({
       isRemovable={isRemovable}
       open={open}
       onOpenChange={setOpen}
-      onRemove={handleRemove}
       onSelect={handleSelect}
     />
   )

package/dist/assets/shared-assets/react-admin/schema.json

@@ -4,7 +4,7 @@
   "title": "BetterStart Schema Definition",
   "description": "JSON Schema for validating custom schema files (courses.json, testimonials.json, instructors.json, events.json, etc.)",
   "type": "object",
-  "required": ["type", "name", "label"],
+  "required": ["name", "label"],
   "additionalProperties": false,
   "properties": {
     "$schema": {
@@ -30,7 +30,7 @@
     },
     "type": {
       "type": "string",
-      "description": "Schema type: 'entity' for CRUD list, 'single' for singleton record (site settings, about page), or 'form' for public submission forms",
+      "description": "Schema type: 'entity' for CRUD list (default), 'single' for singleton record (site settings, about page), or 'form' for public submission forms",
       "enum": ["entity", "single", "form"]
     },
     "fields": {
@@ -157,9 +157,6 @@
         {
           "$ref": "#/$defs/stringField"
         },
-        {
-          "$ref": "#/$defs/emailField"
-        },
         {
           "$ref": "#/$defs/textField"
         },
@@ -426,61 +423,6 @@
         }
       }
     },
-    "emailField": {
-      "type": "object",
-      "description": "Email input field",
-      "required": ["name", "type"],
-      "additionalProperties": false,
-      "properties": {
-        "name": {
-          "type": "string"
-        },
-        "type": {
-          "const": "email"
-        },
-        "label": {
-          "type": "string"
-        },
-        "required": {
-          "type": "boolean"
-        },
-        "length": {
-          "type": "integer",
-          "description": "Maximum character length",
-          "minimum": 1,
-          "maximum": 65535
-        },
-        "hint": {
-          "type": "string"
-        },
-        "placeholder": {
-          "type": "string",
-          "description": "Placeholder text displayed in the email input"
-        },
-        "default": {
-          "type": "string"
-        },
-        "defaultValueFrom": {
-          "$ref": "#/$defs/defaultValueFrom"
-        },
-        "hasIcon": {
-          "type": "boolean",
-          "description": "Whether this field has an associated icon picker"
-        },
-        "hidden": {
-          "type": "boolean",
-          "description": "Whether this field is hidden from the form UI but still exists in the database"
-        },
-        "showWhen": {
-          "$ref": "#/$defs/showWhenCondition"
-        },
-        "height": {
-          "enum": ["auto", "fill"],
-          "default": "auto",
-          "description": "Generated field height behavior: auto size or fill remaining flexible space."
-        }
-      }
-    },
     "markdownField": {
       "type": "object",
       "description": "Rich text editor with markdown support",
@@ -1279,10 +1221,6 @@
           "type": "string",
           "description": "Tab display label"
         },
-        "icon": {
-          "type": "string",
-          "description": "Lucide icon name rendered before the tab label"
-        },
         "fields": {
           "type": "array",
           "description": "Fields within this tab",

package/dist/assets/shared-assets/react-admin/ui/drawer.tsx

@@ -1,14 +1,30 @@
 'use client'
 
 import { cn } from '@admin/utils/shared/cn'
-import type * as React from 'react'
+import * as React from 'react'
 import { Drawer as DrawerPrimitive } from 'vaul'
 
 function Drawer({
+  children,
+  container,
   handleOnly = true,
   ...props
 }: React.ComponentProps<typeof DrawerPrimitive.Root>) {
-  return <DrawerPrimitive.Root data-slot="drawer" handleOnly={handleOnly} {...props} />
+  const portalContainerRef = React.useRef<HTMLDivElement>(null)
+
+  return (
+    <>
+      <div ref={portalContainerRef} data-slot="drawer-container" className="contents" />
+      <DrawerPrimitive.Root
+        data-slot="drawer"
+        container={container ?? portalContainerRef.current}
+        handleOnly={handleOnly}
+        {...props}
+      >
+        {children}
+      </DrawerPrimitive.Root>
+    </>
+  )
 }
 
 function DrawerTrigger({ ...props }: React.ComponentProps<typeof DrawerPrimitive.Trigger>) {

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,
@@ -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) {
@@ -15366,7 +15388,7 @@ export type TabValue = (typeof TAB_VALUES)[number]
   const metadataStrip = showMetadataWidget ? `      {initialData?.id != null && (
         <div
           className={cn(
-            'sticky z-10 flex flex-col gap-1 px-4 bg-background h-14 xl:flex-row xl:items-center xl:justify-between top-14 transition-shadow overflow-x-clip',
+            'sticky z-100 flex flex-col gap-1 px-4 bg-background h-14 xl:flex-row xl:items-center xl:justify-between top-14 transition-shadow overflow-x-clip',
             {
               'shadow-modal/2': hasScrolled,
               'border-b border-border/80': !hasScrolled
@@ -15449,11 +15471,31 @@ ${relState}` : ""}${creatableSelectState ? `
 ${creatableSelectState}` : ""}${staticMultiSelectState ? `
 ${staticMultiSelectState}` : ""}${hasDraft ? "\n  const [submitIntent, setSubmitIntent] = React.useState<'draft' | 'publish' | null>(null)" : ""}
 
+  const defaultValues: FormValues = {
+${defaultValues}
+  }
+
+  const form = useForm<FormValues>({
+    resolver: standardSchemaResolver(formSchema),
+    mode: 'onBlur',
+    reValidateMode: 'onChange',
+    defaultValues
+  })
+  const defaultValuesRef = React.useRef(defaultValues)
+  defaultValuesRef.current = defaultValues
+  React.useEffect(
+    () => () => {
+      form.reset(defaultValuesRef.current)
+    },
+    [form]
+  )
+
   const createMutation = useMutation({
     mutationFn: (data: ${Singular}CreateInput) => create${Singular}(data),
     onSuccess: async () => {
       toast.success('${Singular} created successfully')
       await queryClient.invalidateQueries({ queryKey: ['${plural}'] })
+      form.reset(defaultValues)
       router.push('${adminRoutePath}/${schema.name}')
     },
     onError: (error: Error) => {
@@ -15474,25 +15516,6 @@ ${staticMultiSelectState}` : ""}${hasDraft ? "\n  const [submitIntent, setSubmit
   })
 
   const isPending = createMutation.isPending || updateMutation.isPending
-
-  const defaultValues: FormValues = {
-${defaultValues}
-  }
-
-  const form = useForm<FormValues>({
-    resolver: standardSchemaResolver(formSchema),
-    mode: 'onBlur',
-    reValidateMode: 'onChange',
-    defaultValues
-  })
-  const defaultValuesRef = React.useRef(defaultValues)
-  defaultValuesRef.current = defaultValues
-  React.useEffect(
-    () => () => {
-      form.reset(defaultValuesRef.current)
-    },
-    [form]
-  )
   const { isDirty } = form.formState
 ${hasDraft ? "  const canPublishPristineDraft = Boolean(initialData && !initialData.published)\n  const canSubmitDraftAction = Boolean(initialData?.published || isDirty)\n  const canSubmitPublishAction = isDirty || canPublishPristineDraft\n" : ""}
 ${defaultValueFromSyncFunctions ? `
@@ -15607,9 +15630,7 @@ ${topLevelTabsField ? `import type { TabValue } from '${hookImportPath}'
 import { ${hookName} } from '${hookImportPath}'
 import { ${contentComponentName} } from './${schema.name}-form-content'
 
-${metadataOffsetConst}export type { FormValues } from '${hookImportPath}'
-
-interface ${Singular}FormProps {
+${metadataOffsetConst}interface ${Singular}FormProps {
   initialData?: ${Singular}
   pageTitle: string
 }
@@ -21131,14 +21152,14 @@ ${styleText(
         value: "resend",
         label: "Resend"
       },
-      {
-        value: "skip",
-        label: "Skip"
-      },
       {
         value: "cloudflare",
         label: `Cloudflare ${styleText("dim", "(coming soon)")}`,
         disabled: true
+      },
+      {
+        value: "skip",
+        label: "Skip"
       }
     ],
     initialValue: "resend"
@@ -23620,6 +23641,7 @@ async function runInitCommand(name, options) {
     integrations: [],
     storage: "local"
   } : await promptPlugins();
+  const collectedIntegrationConfig = !options.yes && pluginSelection.integrations.length > 0 ? await collectIntegrationConfig(cwd, pluginSelection.integrations) : { sections: [], overwriteKeys: /* @__PURE__ */ new Set() };
   let databaseUrl;
   const existingDbUrl = readExistingDbUrl(cwd);
   if (options.yes) {
@@ -23679,6 +23701,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",
@@ -23807,7 +23836,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({