@betterstart/cli 0.1.64 → 0.1.66

package/dist/cli.js

@@ -8694,7 +8694,6 @@ export const { signIn, signUp, signOut, useSession } = authClient
 function authMiddlewareTemplate() {
   return `import { headers } from 'next/headers'
 import { redirect } from 'next/navigation'
-import { connection } from 'next/server'
 import { auth, type User } from './auth'
 
 export enum UserRole {
@@ -8711,7 +8710,6 @@ export function isUserRole(value: unknown): value is UserRole {
  * Get the current session from Better Auth
  */
 export async function getSession() {
-  await connection()
   const session = await auth.api.getSession({
     headers: await headers(),
   })
@@ -12399,12 +12397,21 @@ import path40 from "path";
 
 // src/init/templates/pages/authenticated-layout.ts
 function authenticatedLayoutTemplate() {
-  return `import { requireRole } from '@cms/auth/middleware'
+  return `import { Suspense } from 'react'
+import { requireRole } from '@cms/auth/middleware'
 import { CmsSidebar } from '@cms/components/layout/cms-sidebar'
 import { SidebarInset, SidebarProvider } from '@cms/components/ui/sidebar'
 import { UserRole } from '@cms/types/auth'
 
-export default async function CmsAuthLayout({ children }: { children: React.ReactNode }) {
+export default function CmsAuthLayout({ children }: { children: React.ReactNode }) {
+  return (
+    <Suspense fallback={<div className="flex items-center justify-center h-screen"><div className="text-muted-foreground">Loading...</div></div>}>
+      <AuthenticatedShell>{children}</AuthenticatedShell>
+    </Suspense>
+  )
+}
+
+async function AuthenticatedShell({ children }: { children: React.ReactNode }) {
   await requireRole([UserRole.ADMIN, UserRole.EDITOR])
 
   return (
@@ -15633,6 +15640,9 @@ var TEMPLATE_REGISTRY = {
   validation: { relPath: "utils/validation.ts", content: validationUtilTemplate },
   webhook: { relPath: "utils/webhook.ts", content: webhookUtilTemplate },
   mailchimp: { relPath: "utils/mailchimp.ts", content: mailchimpUtilTemplate },
+  // Auth
+  "auth-middleware": { relPath: "lib/auth/middleware.ts", content: authMiddlewareTemplate },
+  "auth-layout": { relPath: "app/(cms)/cms/(authenticated)/layout.tsx", content: authenticatedLayoutTemplate, base: "cwd" },
   // Lib
   r2: { relPath: "lib/r2.ts", content: r2ClientTemplate },
   "form-settings-action": { relPath: "lib/actions/form-settings.ts", content: formSettingsActionTemplate },
@@ -15721,7 +15731,8 @@ var updateComponentCommand = new Command7("update-component").description("Updat
   for (const name of toUpdate) {
     if (TEMPLATE_REGISTRY[name]) {
       const entry = TEMPLATE_REGISTRY[name];
-      const destPath = path49.join(cms, entry.relPath);
+      const baseDir = entry.base === "cwd" ? cwd : cms;
+      const destPath = path49.join(baseDir, entry.relPath);
       fsExtra.ensureDirSync(path49.dirname(destPath));
       fs45.writeFileSync(destPath, entry.content(), "utf-8");
       clack2.log.success(`Updated ${entry.relPath}`);