betterstart-cli 0.0.107 → 0.0.109

package/dist/assets/adapters/next/templates/init/admin-globals.css

@@ -5,8 +5,6 @@
 
 @plugin "@tailwindcss/typography";
 
-@custom-variant dark (&:is(.dark *));
-
 @theme inline {
   --color-background: var(--background);
   --color-foreground: var(--foreground);
@@ -97,9 +95,10 @@
   --accent-foreground: oklch(0.15 0 0);
   --destructive: oklch(0.577 0.245 27.325);
   --warning: oklch(0.625 0.165 57.4);
+  --warning-foreground: oklch(0.625 0.165 57.4);
   --border: oklch(0.93 0 0);
   --highlight: oklch(0.9 0.004 286.32);
-  --input: oklch(0.994 0 0);
+  --input: oklch(0.93 0 0);
   --ring: oklch(0.708 0 0);
   --chart-1: oklch(0.845 0.143 164.978);
   --chart-2: oklch(0.696 0.17 162.48);
@@ -174,65 +173,6 @@
   --tt-color-highlight-pink-contrast: rgba(225, 136, 179, 0.27);
 }
 
-.dark {
-  --background: oklch(0.144 0 0);
-  --foreground: oklch(0.985 0 0);
-  --card: oklch(0.15 0 0);
-  --card-foreground: oklch(0.985 0 0);
-  --popover: oklch(0.15 0 0);
-  --popover-foreground: oklch(0.985 0 0);
-  --primary: oklch(0.922 0 0);
-  --primary-foreground: oklch(0.15 0 0);
-  --secondary: oklch(0.269 0 0);
-  --secondary-foreground: oklch(0.985 0 0);
-  --muted: oklch(0.269 0 0);
-  --muted-foreground: oklch(0.708 0 0);
-  --accent: oklch(0.269 0 0);
-  --accent-foreground: oklch(0.985 0 0);
-  --destructive: oklch(0.704 0.191 22.216);
-  --warning: oklch(0.75 0.2 90);
-  --warning-foreground: oklch(0.625 0.165 57.4);
-  --border: oklch(1 0 0 / 10%);
-  --highlight: oklch(1 0 0 / 10%);
-  --input: oklch(1 0 0 / 15%);
-  --ring: oklch(0.556 0 0);
-  --chart-1: oklch(0.845 0.143 164.978);
-  --chart-2: oklch(0.696 0.17 162.48);
-  --chart-3: oklch(0.596 0.145 163.225);
-  --chart-4: oklch(0.508 0.118 165.612);
-  --chart-5: oklch(0.432 0.095 166.913);
-  --sidebar: oklch(0.15 0 0);
-  --sidebar-foreground: oklch(0.985 0 0);
-  --sidebar-primary: oklch(0.488 0.243 264.376);
-  --sidebar-primary-foreground: oklch(0.985 0 0);
-  --sidebar-accent: oklch(0.269 0 0);
-  --sidebar-accent-foreground: oklch(0.985 0 0);
-  --sidebar-border: oklch(1 0 0 / 10%);
-  --sidebar-ring: oklch(0.556 0 0);
-  --tt-bg-color: var(--background);
-  --tt-bg-color-contrast: var(--border);
-  --tt-color-highlight-yellow: #6b6524;
-  --tt-color-highlight-green: #509568;
-  --tt-color-highlight-blue: #6e92aa;
-  --tt-color-highlight-purple: #583e74;
-  --tt-color-highlight-red: #743e42;
-  --tt-color-highlight-gray: rgb(47, 47, 47);
-  --tt-color-highlight-brown: rgb(74, 50, 40);
-  --tt-color-highlight-orange: rgb(92, 59, 35);
-  --tt-color-highlight-pink: rgb(78, 44, 60);
-  --tt-color-highlight-yellow-contrast: #58531e;
-  --tt-color-highlight-green-contrast: #47855d;
-  --tt-color-highlight-blue-contrast: #5e86a1;
-  --tt-color-highlight-purple-contrast: #4c3564;
-  --tt-color-highlight-red-contrast: #643539;
-  --tt-color-highlight-gray-contrast: rgba(255, 255, 255, 0.094);
-  --tt-color-highlight-brown-contrast: rgba(184, 101, 69, 0.25);
-  --tt-color-highlight-orange-contrast: rgba(233, 126, 37, 0.2);
-  --tt-color-highlight-pink-contrast: rgba(220, 76, 145, 0.22);
-  --shadow-small: 0px 1px 2px #00000029;
-  --shadow-medium: 0px 2px 2px #00000052, 0px 8px 8px -8px #00000029;
-}
-
 @layer base {
   * {
     @apply border-border outline-ring/50;

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

@@ -1,31 +1,14 @@
 'use client'
 
-import { Button } from '@admin/components/ui/button'
 import { SidebarTrigger, useSidebar } from '@admin/components/ui/sidebar'
-import { useTheme } from '@admin/hooks/use-admin-theme'
-import { Moon, Sun } from 'lucide-react'
 
 export function AdminHeader() {
-  const { theme, setTheme } = useTheme()
   const { state } = useSidebar()
 
   return (
     <header className="sticky top-0 z-50 flex h-14 w-full shrink-0 items-center gap-2 border-b border-border">
-      <div className="flex w-full flex-1 items-center justify-between gap-1 px-5">
-        <div className="flex w-full items-center gap-2">
-          {state === 'collapsed' && <SidebarTrigger />}
-        </div>
-        <div className="ml-auto flex items-center gap-2">
-          <Button
-            variant="ghost"
-            size="icon"
-            onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')}
-          >
-            <Sun className="size-4 scale-100 rotate-0 transition-all dark:scale-0 dark:-rotate-90" />
-            <Moon className="absolute size-4 scale-0 rotate-90 transition-all dark:scale-100 dark:rotate-0" />
-            <span className="sr-only">Toggle theme</span>
-          </Button>
-        </div>
+      <div className="flex w-full flex-1 items-center gap-2 px-5">
+        {state === 'collapsed' && <SidebarTrigger />}
       </div>
     </header>
   )

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

@@ -2,7 +2,6 @@
 
 import { Toaster } from '@admin/components/ui/sonner'
 import { TooltipProvider } from '@admin/components/ui/tooltip'
-import { AdminThemeProvider } from '@admin/hooks/use-admin-theme'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { useState } from 'react'
 
@@ -22,12 +21,10 @@ export function AdminProviders({ children }: { children: React.ReactNode }) {
 
   return (
     <QueryClientProvider client={queryClient}>
-      <AdminThemeProvider>
-        <TooltipProvider>
-          {children}
-          <Toaster position="top-right" richColors />
-        </TooltipProvider>
-      </AdminThemeProvider>
+      <TooltipProvider>
+        {children}
+        <Toaster position="top-right" richColors />
+      </TooltipProvider>
     </QueryClientProvider>
   )
 }

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

@@ -60,7 +60,6 @@ export async function SidebarUserMenu() {
                 render={
                   <Link
                     href="/admin/profile"
-                    prefetch={true}
                     className="flex w-full items-center justify-between gap-2 py-2 pr-1"
                   />
                 }

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

@@ -70,7 +70,9 @@ export function DataTablePagination<TData>(props: DataTablePaginationProps<TData
   )
 
   const handlePageSizeChange = React.useCallback(
-    (value: string) => {
+    (value: string | null) => {
+      if (value === null) return
+
       React.startTransition(() => {
         if (value === 'all') {
           setPageSize(-1)

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode/copyable-code-block.tsx

@@ -5,7 +5,6 @@ import type { DevModeCodeLanguage, DevModeSnippetCodeTab } from './dev-mode-type
 import { Button } from '@admin/components/ui/button'
 import { Card, CardContent, CardHeader } from '@admin/components/ui/card'
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@admin/components/ui/tabs'
-import { useTheme } from '@admin/hooks/use-admin-theme'
 import { useCopyToClipboard } from '@admin/hooks/use-copy-to-clipboard'
 import { Check, Copy } from 'lucide-react'
 import { PlainCodeFallback } from './plain-code-fallback'
@@ -21,8 +20,6 @@ interface CopyableCodeBlockProps {
 
 export function CopyableCodeBlock({ label, code, language, tabs }: CopyableCodeBlockProps) {
   const [copy, isCopied] = useCopyToClipboard()
-  const { resolvedTheme } = useTheme()
-  const codeTheme = resolvedTheme === 'dark' ? 'dark' : 'light'
   const fallbackTab: DevModeSnippetCodeTab = {
     id: 'code',
     label,
@@ -68,7 +65,7 @@ export function CopyableCodeBlock({ label, code, language, tabs }: CopyableCodeB
             <TabsContent key={tab.id} value={tab.id} className="min-h-0 overflow-auto">
               <CardContent className="h-full overflow-auto p-0">
                 <React.Suspense fallback={<PlainCodeFallback code={tab.code} />}>
-                  <LazyCodeMirror code={tab.code} language={tab.language} theme={codeTheme} />
+                  <LazyCodeMirror code={tab.code} language={tab.language} />
                 </React.Suspense>
               </CardContent>
             </TabsContent>
@@ -94,7 +91,7 @@ export function CopyableCodeBlock({ label, code, language, tabs }: CopyableCodeB
           </CardHeader>
           <CardContent className="overflow-auto p-0">
             <React.Suspense fallback={<PlainCodeFallback code={code} />}>
-              <LazyCodeMirror code={code} language={language} theme={codeTheme} />
+              <LazyCodeMirror code={code} language={language} />
             </React.Suspense>
           </CardContent>
         </>

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

@@ -1,11 +1,11 @@
 'use client'
 
 import * as React from 'react'
-import type { DevModeCodeLanguage, DevModeCodeTheme } from './dev-mode-types'
+import type { DevModeCodeLanguage } from './dev-mode-types'
 import { javascript } from '@codemirror/lang-javascript'
 import { json } from '@codemirror/lang-json'
 import { EditorView } from '@codemirror/view'
-import { githubDark, githubLight } from '@uiw/codemirror-theme-github'
+import { githubLight } from '@uiw/codemirror-theme-github'
 import CodeMirror from '@uiw/react-codemirror'
 
 const codeMirrorSetup = {
@@ -43,10 +43,9 @@ const compactCodeTheme = EditorView.theme({
 interface DevModeCodeMirrorProps {
   code: string
   language: DevModeCodeLanguage
-  theme: DevModeCodeTheme
 }
 
-export default function DevModeCodeMirror({ code, language, theme }: DevModeCodeMirrorProps) {
+export default function DevModeCodeMirror({ code, language }: DevModeCodeMirrorProps) {
   const extensions = React.useMemo(
     () =>
       language === 'json'
@@ -62,7 +61,7 @@ export default function DevModeCodeMirror({ code, language, theme }: DevModeCode
       readOnly
       basicSetup={codeMirrorSetup}
       extensions={extensions}
-      theme={theme === 'dark' ? githubDark : githubLight}
+      theme={githubLight}
       className="flex-1 [&>.cm-editor]:h-full"
     />
   )

package/dist/assets/adapters/next/templates/init/components/shared/dev-mode/dev-mode-types.ts

@@ -1,5 +1,4 @@
 export type DevModeCodeLanguage = 'tsx' | 'ts' | 'json'
-export type DevModeCodeTheme = 'light' | 'dark'
 export type DevModeSnippetIcon =
   | 'eye'
   | 'file-code'

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

@@ -102,6 +102,7 @@ export function EditMediaDialogContent({
         </DrawerHeader>
         <Form {...form}>
           <form
+            autoComplete="off"
             id={formId}
             onSubmit={form.handleSubmit(handleSave)}
             className="flex flex-1 flex-col gap-4 overflow-y-auto px-6 pt-px pb-4"

package/dist/assets/adapters/next/templates/init/components/shared/media/media-grid-pagination.tsx

@@ -41,7 +41,9 @@ export function MediaGridPagination({
   const perPage = 'Rows per page'
 
   const handlePageSizeChange = React.useCallback(
-    (value: string) => {
+    (value: string | null) => {
+      if (value === null) return
+
       React.startTransition(() => {
         onPageSizeChange(Number(value))
         onPageChange(1)

package/dist/assets/adapters/next/templates/init/components/shared/media/media-url-importer.tsx

@@ -2,7 +2,9 @@
 
 import * as React from 'react'
 import type { UploadFileResult } from '@admin/types'
+import type { FieldErrors } from 'react-hook-form'
 import { Card, CardContent } from '@admin/components/ui/card'
+import { Form } from '@admin/components/ui/form'
 import {
   InputGroup,
   InputGroupAddon,
@@ -15,19 +17,29 @@ import { getMediaUrlPlaceholder } from '@admin/utils/media/get-media-url-placeho
 import { cn } from '@admin/utils/shared/cn'
 import { isValidUrl } from '@admin/utils/validation/is-valid-url'
 import { Upload } from 'lucide-react'
+import { useForm } from 'react-hook-form'
+import { toast } from 'sonner'
 
 interface MediaUrlImporterProps extends React.HTMLAttributes<HTMLDivElement> {
   onImportFromUrl: (url: string) => Promise<UploadFileResult>
   accept?: string
 }
 
+interface MediaUrlFormValues {
+  url: string
+}
+
 export function MediaUrlImporter({ onImportFromUrl, accept, className }: MediaUrlImporterProps) {
-  const [urlValue, setUrlValue] = React.useState('')
-  const [urlError, setUrlError] = React.useState<string | null>(null)
   const [isImporting, startImportTransition] = React.useTransition()
   const mountedRef = React.useRef(true)
   const importInFlightRef = React.useRef(false)
   const importRequestIdRef = React.useRef(0)
+  const form = useForm<MediaUrlFormValues>({
+    defaultValues: { url: '' },
+    mode: 'onSubmit',
+    reValidateMode: 'onChange'
+  })
+  const urlField = form.register('url', { required: 'Enter a direct media URL to import.' })
 
   React.useEffect(() => {
     mountedRef.current = true
@@ -42,93 +54,92 @@ export function MediaUrlImporter({ onImportFromUrl, accept, className }: MediaUr
   const urlHelpText = getMediaUrlHelpText(accept)
   const urlPlaceholder = getMediaUrlPlaceholder(accept)
 
-  const handleImport = React.useCallback(() => {
-    if (isImporting || importInFlightRef.current) return
-
-    const nextUrl = urlValue.trim()
-
-    if (!nextUrl) {
-      setUrlError('Enter a direct media URL to import.')
-      return
-    }
-
-    if (!isValidUrl(nextUrl)) {
-      setUrlError('Enter a valid HTTP or HTTPS URL.')
-      return
-    }
-
-    setUrlError(null)
-    const importRequestId = importRequestIdRef.current + 1
-    importRequestIdRef.current = importRequestId
-    importInFlightRef.current = true
+  const handleImport = React.useCallback(
+    (values: MediaUrlFormValues) => {
+      if (isImporting || importInFlightRef.current) return
 
-    startImportTransition(async () => {
-      try {
-        const result = await onImportFromUrl(nextUrl)
+      const nextUrl = values.url.trim()
 
-        if (!mountedRef.current || importRequestIdRef.current !== importRequestId) {
-          return
-        }
-
-        if (!result.success) {
-          setUrlError(result.error ?? 'Failed to import media from URL.')
-          return
-        }
+      if (!isValidUrl(nextUrl)) {
+        toast.error('Enter a valid HTTP or HTTPS URL.')
+        return
+      }
 
-        setUrlValue('')
-      } catch (error) {
-        if (!mountedRef.current || importRequestIdRef.current !== importRequestId) {
-          return
+      const importRequestId = importRequestIdRef.current + 1
+      importRequestIdRef.current = importRequestId
+      importInFlightRef.current = true
+
+      startImportTransition(async () => {
+        try {
+          const result = await onImportFromUrl(nextUrl)
+
+          if (!mountedRef.current || importRequestIdRef.current !== importRequestId) {
+            return
+          }
+
+          if (!result.success) {
+            toast.error(result.error ?? 'Failed to import media from URL.')
+            return
+          }
+
+          form.reset()
+        } catch (error) {
+          if (!mountedRef.current || importRequestIdRef.current !== importRequestId) {
+            return
+          }
+
+          toast.error(error instanceof Error ? error.message : 'Failed to import media from URL.')
+        } finally {
+          if (importRequestIdRef.current === importRequestId) {
+            importInFlightRef.current = false
+          }
         }
+      })
+    },
+    [form, isImporting, onImportFromUrl]
+  )
 
-        setUrlError(error instanceof Error ? error.message : 'Failed to import media from URL.')
-      } finally {
-        if (importRequestIdRef.current === importRequestId) {
-          importInFlightRef.current = false
-        }
-      }
-    })
-  }, [isImporting, onImportFromUrl, urlValue])
+  const handleInvalid = (errors: FieldErrors<MediaUrlFormValues>) => {
+    const message = errors.url?.message
+    toast.error(typeof message === 'string' ? message : 'Enter a direct media URL to import.')
+  }
 
   return (
     <Card className={cn('flex items-center justify-center', className)}>
       <CardContent className="h-full w-full">
         <div className="flex h-full w-full flex-col items-center justify-center gap-3 text-center">
-          <InputGroup className="mx-auto max-w-2xl bg-background">
-            <InputGroupInput
-              type="url"
-              name="url"
-              aria-label="Media URL"
-              value={urlValue}
-              placeholder={urlPlaceholder}
+          <Form {...form}>
+            <form
               autoComplete="off"
-              spellCheck={false}
-              onChange={(event) => {
-                setUrlValue(event.target.value)
-                if (urlError) setUrlError(null)
-              }}
-              onKeyDown={(event) => {
-                if (event.key === 'Enter') {
-                  event.preventDefault()
-                  void handleImport()
-                }
-              }}
-              disabled={isImporting}
-            />
-            <InputGroupAddon align="inline-end">
-              <InputGroupButton
-                type="button"
-                variant="outline"
-                onClick={() => void handleImport()}
-                disabled={isImporting}
-                aria-busy={isImporting}
-                className="h-full px-5"
-              >
-                {isImporting ? <Spinner /> : <Upload />}
-                {isImporting ? 'Importing…' : 'Import'}
-              </InputGroupButton>
-            </InputGroupAddon>
-          </InputGroup>
+              noValidate
+              onSubmit={form.handleSubmit(handleImport, handleInvalid)}
+              className="w-full"
+            >
+              <InputGroup className="mx-auto max-w-2xl bg-background">
+                <InputGroupInput
+                  type="url"
+                  aria-label="Media URL"
+                  placeholder={urlPlaceholder}
+                  autoComplete="off"
+                  spellCheck={false}
+                  {...urlField}
+                  disabled={isImporting}
+                />
+                <InputGroupAddon align="inline-end">
+                  <InputGroupButton
+                    type="submit"
+                    variant="outline"
+                    disabled={isImporting}
+                    aria-busy={isImporting}
+                    className="h-full px-5"
+                  >
+                    {isImporting ? <Spinner /> : <Upload />}
+                    {isImporting ? 'Importing…' : 'Import'}
+                  </InputGroupButton>
+                </InputGroupAddon>
+              </InputGroup>
+            </form>
+          </Form>
 
           <div className="flex w-full flex-col items-center text-center">
             <p className="text-sm text-muted-foreground">{urlHelpText}</p>

package/dist/assets/adapters/next/templates/init/components/shared/search-input.tsx

@@ -40,7 +40,11 @@ export function SearchInput({
 
   return (
     <Form {...form}>
-      <form onSubmit={form.handleSubmit(onSubmit)} className="flex w-full items-center">
+      <form
+        autoComplete="off"
+        onSubmit={form.handleSubmit(onSubmit)}
+        className="flex w-full items-center"
+      >
         <FormField
           control={form.control}
           name="search"

package/dist/assets/adapters/next/templates/init/hooks/content-editor/use-content-editor-source-mode.tsx

@@ -9,7 +9,6 @@ import type { QueryClient } from '@tanstack/react-query'
 import type { ReactCodeMirrorRef } from '@uiw/react-codemirror'
 import type { Root } from 'react-dom/client'
 import { MediaField } from '@admin/components/custom/media-field'
-import { useTheme } from '@admin/hooks/use-admin-theme'
 import { applyCursorChange } from '@admin/utils/editor/apply-cursor-change'
 import { applyCursorChangeIfAvailable } from '@admin/utils/editor/apply-cursor-change-if-available'
 import { createMarkdownTableText } from '@admin/utils/editor/create-markdown-table-text'
@@ -33,11 +32,12 @@ import { redo, redoDepth, undo, undoDepth } from '@codemirror/commands'
 import { markdown } from '@codemirror/lang-markdown'
 import { Decoration, EditorView, WidgetType } from '@codemirror/view'
 import { QueryClientProvider, useQueryClient } from '@tanstack/react-query'
-import { githubDarkInit, githubLightInit } from '@uiw/codemirror-theme-github'
+import { githubLightInit } from '@uiw/codemirror-theme-github'
 import { NuqsAdapter } from 'nuqs/adapters/react'
 import { createRoot } from 'react-dom/client'
 
 const ADMIN_MONO_FONT_FAMILY = 'var(--font-geist-mono), ui-monospace, SFMono-Regular, monospace'
+const editorTheme = githubLightInit({ settings: { fontFamily: ADMIN_MONO_FONT_FAMILY } })
 
 type MarkdownMediaGalleryWidgetProps = {
   widgetId: number
@@ -150,15 +150,6 @@ export function useContentEditorSourceMode({
   const [isMarkdownLinkActive, setIsMarkdownLinkActive] = React.useState(false)
   const [canUndoMarkdownChange, setCanUndoMarkdownChange] = React.useState(false)
   const [canRedoMarkdownChange, setCanRedoMarkdownChange] = React.useState(false)
-  const { resolvedTheme } = useTheme()
-  const editorTheme = React.useMemo(
-    () =>
-      resolvedTheme === 'dark'
-        ? githubDarkInit({ settings: { fontFamily: ADMIN_MONO_FONT_FAMILY } })
-        : githubLightInit({ settings: { fontFamily: ADMIN_MONO_FONT_FAMILY } }),
-    [resolvedTheme]
-  )
-
   const valueRef = React.useRef(value)
   valueRef.current = value
   const onChangeRef = React.useRef(onChange)

package/dist/assets/adapters/next/templates/init/hooks/content-editor/use-content-editor.ts

@@ -99,8 +99,7 @@ export function useContentEditor({
         autocomplete: 'off',
         autocorrect: 'off',
         autocapitalize: 'off',
-        class:
-          'simple-editor content-editor-prose prose prose-sm max-w-none dark:prose-invert focus:outline-none'
+        class: 'simple-editor content-editor-prose prose prose-sm max-w-none focus:outline-none'
       },
       handleKeyDown: (_view, event) => handleSlashKeyDown(event)
     },