betterstart-cli 0.0.121 → 0.0.123

package/dist/cli.js

@@ -16340,9 +16340,10 @@ ${join}
               </div>`;
 }
 function renderFormLayoutDetailsTemplate() {
-  return `className={initialData?.id != null
-                  ? 'sticky top-32 space-y-4 pb-4'
-                  : 'sticky top-14 space-y-4 pb-4'}`;
+  return `className={cn('sticky space-y-4', {
+                  'top-32': initialData?.id != null,
+                  'top-14': initialData?.id == null
+                })}`;
 }
 function renderFormCardContentGridTemplate({
   tabSidebarEntriesGrid,
@@ -16384,8 +16385,8 @@ function renderFormCardContentDetailsTemplate({
 }) {
   return `${formGridOpen}
               <div className="h-full min-w-0">
-                <Card className="min-w-0 h-full">
-                <CardContent className="space-y-5 gap-0 h-full">
+                <Card className="h-full min-w-0">
+                <CardContent className="flex h-full min-h-0 flex-col space-y-5 p-8">
 ${mainFieldsJsx}
 </CardContent>
                 </Card>
@@ -16822,7 +16823,7 @@ function renderFormLayoutDetailsBranchBodyTemplate({
   return `      {initialData?.id != null && (
         <div
           className={cn(
-            'sticky z-100 flex flex-row items-center justify-between gap-1 px-4 bg-background h-14 top-14 transition-shadow overflow-x-clip',
+            'sticky top-14 z-20 flex h-14 flex-row items-center justify-between gap-1 overflow-x-clip bg-background px-6 transition-shadow',
             {
               'shadow-modal/2': hasScrolled,
               'border-b border-border/80': !hasScrolled
@@ -16874,7 +16875,7 @@ function renderFormTabContentDetailsTemplate({
           </TabsContent>`;
 }
 function renderEntityFormBody({ contentComponentName }) {
-  return `      <main className="w-full p-4 h-full">
+  return `      <main className="h-full w-full px-6 pt-6">
         <${contentComponentName} state={entityForm} />
       </main>`;
 }
@@ -17036,7 +17037,7 @@ function buildEntityFormArtifacts({
   const withHandlerSection = (handlers) => handlers ? `
 ${handlers}
 ` : "";
-  const needsCn = hasRelationship || hasSelectCombobox || shouldGuardSidebarByTab;
+  const needsCn = hasRelationship || hasSelectCombobox || shouldGuardSidebarByTab || /\bcn\s*\(/.test(formBodyJSX);
   const metadataOffsetConst = showMetadataWidget ? "const SCROLL_BORDER_OFFSET = 8;\n\n" : "";
   const metadataScrollState = showMetadataWidget ? "  const hasScrolled = usePageScrollThreshold(SCROLL_BORDER_OFFSET)\n" : "";
   const metadataStrip = showMetadataWidget ? renderEntityFormPageRenderer({
@@ -19278,7 +19279,7 @@ function renderTextareaField(field, indent, label, hintJSX, context) {
         `${indent}      `
       ),
       toLowerCase: label.toLowerCase(),
-      fillControlClass: fillControlClass(field, "min-h-[80px]"),
+      fillControlClass: fillControlClass(field, "min-h-20"),
       fieldProps
     }
   });
@@ -19660,7 +19661,7 @@ function buildEntityFormLayout({
   const sidebarVisibilityState = shouldGuardSidebarByTab ? `
   const hasVisibleSidebarFields = ${sidebarTabNames.map((tabName) => `activeTab === ${JSON.stringify(tabName)}`).join(" || ")}
 ` : "";
-  const formGridOpen = shouldGuardSidebarByTab ? renderEntityFormContentRenderer({ kind: "renderFormLayoutDetailsBranchTemplate" }) : `            <div className="grid ${hasSidebarFields ? "grid-cols-entity-form" : "grid-cols-1"} gap-4 items-start h-full">`;
+  const formGridOpen = shouldGuardSidebarByTab ? renderEntityFormContentRenderer({ kind: "renderFormLayoutDetailsBranchTemplate" }) : `            <div className="grid h-full ${hasSidebarFields ? "grid-cols-entity-form" : "grid-cols-1"} items-start gap-6">`;
   const sidebarCardJSX = !hasSidebarFields ? "" : shouldGuardSidebarByTab ? renderEntityFormContentRenderer({
     kind: "renderFormContentSidebarColumnTemplate",
     props: {
@@ -21261,7 +21262,8 @@ ${createButtonContent}
         }
       />
 ${hasFiltersLabel}
-      <main className="space-y-4 px-4 pb-4 flex-1">
+
+      <main className="flex-1 space-y-4 px-6 pb-6">
         <${plural}Table ${tableProps} />${sortOrderDialog}
       </main>
     </React.Fragment>
@@ -32263,7 +32265,8 @@ function scaffoldCoreSchemas({
   const schemaName = "settings";
   const schemaPath = path71.join(cwd, config.paths.schemas, `${schemaName}.json`);
   fs60.mkdirSync(path71.dirname(schemaPath), { recursive: true });
-  fs60.writeFileSync(schemaPath, schemaContent, "utf-8");
+  fs60.writeFileSync(schemaPath, `${schemaContent}
+`, "utf-8");
   result.schemas.push(`${schemaName}.json`);
   ensureSnapshotGitFiles(cwd);
   try {
@@ -32510,7 +32513,6 @@ function scaffoldLayout({ cwd, config }) {
   );
   write(path74.join(config.paths.pages, "page.tsx"), readTemplate("pages/dashboard-page.tsx"));
   const containerDir = path74.join(config.paths.pages, ADMIN_CONTAINER_ROUTE_GROUP);
-  write(path74.join(containerDir, "layout.tsx"), readTemplate("pages/container-layout.tsx"));
   const usersDir = path74.join(containerDir, "users");
   write(path74.join(usersDir, "page.tsx"), readTemplate("pages/users/users-page.tsx"));
   write(
@@ -33499,20 +33501,50 @@ function renderBaseFontDeclarations() {
 `;
 }
 
+// adapters/next/templates/renderers/init/scaffolders/tailwind/mono-font-family-rule.ts
+function renderMonoFontFamilyRule() {
+  return `code,
+kbd,
+samp,
+pre {
+  font-family: var(--font-geist-mono);
+}
+`;
+}
+
+// adapters/next/templates/renderers/init/scaffolders/tailwind/root-font-family-rule.ts
+function renderRootFontFamilyRule() {
+  return `html {
+  font-family: var(--font-geist-sans);
+}
+`;
+}
+
 // adapters/next/init/scaffolders/tailwind/apply-base-font.ts
 function applyBaseFont(content) {
   const bodyRule = /(?:^|\n)body\s*\{[^}]*\}/.exec(content);
   if (!bodyRule) {
     return `${content}
+${renderRootFontFamilyRule()}
 body {
 ${renderBaseFontDeclarations()}}
-`;
+
+${renderMonoFontFamilyRule()}`;
   }
-  if (/font-size\s*:/.test(bodyRule[0])) {
-    return content;
+  const leadingNewline = bodyRule[0].startsWith("\n") ? "\n" : "";
+  let rule = bodyRule[0].slice(leadingNewline.length).replace(/\n[ \t]*font-family:[^;]*;/g, "");
+  if (!/font-size\s*:/.test(rule)) {
+    const closingBrace = rule.length - 1;
+    rule = `${rule.slice(0, closingBrace)}${renderBaseFontDeclarations()}${rule.slice(closingBrace)}`;
   }
-  const closingBrace = bodyRule.index + bodyRule[0].length - 1;
-  return `${content.slice(0, closingBrace)}${renderBaseFontDeclarations()}${content.slice(closingBrace)}`;
+  const before = content.slice(0, bodyRule.index);
+  const after = content.slice(bodyRule.index + bodyRule[0].length);
+  const rootRule = content.includes(renderRootFontFamilyRule()) ? "" : `${renderRootFontFamilyRule()}
+`;
+  const monoRule = content.includes(renderMonoFontFamilyRule()) ? "" : `
+
+${renderMonoFontFamilyRule()}`;
+  return `${before}${leadingNewline}${rootRule}${rule}${monoRule}${after}`;
 }
 
 // adapters/next/init/scaffolders/tailwind/get-admin-theme-vars.ts
@@ -38352,11 +38384,6 @@ var TEMPLATE_REGISTRY = {
     base: "cwd",
     dependencies: ["auth-gate"]
   },
-  "container-layout": {
-    relPath: "app/(admin)/admin/(authenticated)/(container)/layout.tsx",
-    content: () => readTemplate("pages/container-layout.tsx"),
-    base: "cwd"
-  },
   "auth-gate": {
     relPath: "app/(admin)/admin/(authenticated)/auth-gate.tsx",
     content: () => readTemplate("pages/auth-gate.tsx"),