create-nextblock 0.2.33 → 0.2.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.2.33",
+  "version": "0.2.35",
   "description": "",
   "main": "index.js",
   "bin": {

package/templates/nextblock-template/app/[slug]/PageClientContent.tsx

@@ -1,19 +1,19 @@
 // app/[slug]/PageClientContent.tsx
 "use client";
 
-import React, { useState, useEffect, useMemo } from 'react';
-import { useRouter } from 'next/navigation'; // For navigation on lang switch
-import type { Database } from "@nextblock-cms/db";
-import { useLanguage } from '@/context/LanguageContext';
-import { useCurrentContent } from '@/context/CurrentContentContext';
-import Link from 'next/link';
-import { createClient } from '@nextblock-cms/db';
-
-type PageType = Database['public']['Tables']['pages']['Row'];
-type BlockType = Database['public']['Tables']['blocks']['Row'];
-
-interface PageClientContentProps {
-  initialPageData: (PageType & { blocks: BlockType[]; language_code: string; language_id: number; translation_group_id: string; }) | null;
+import React, { useState, useEffect, useMemo } from 'react';
+import { useRouter } from 'next/navigation'; // For navigation on lang switch
+import type { Database } from "@nextblock-cms/db";
+import { useLanguage } from '@/context/LanguageContext';
+import { useCurrentContent } from '@/context/CurrentContentContext';
+import Link from 'next/link';
+import { createClient } from '@nextblock-cms/db';
+
+type PageType = Database['public']['Tables']['pages']['Row'];
+type BlockType = Database['public']['Tables']['blocks']['Row'];
+
+interface PageClientContentProps {
+  initialPageData: (PageType & { blocks: BlockType[]; language_code: string; language_id: number; translation_group_id: string; }) | null;
   currentSlug: string; // The slug of the currently viewed page
   children: React.ReactNode;
   translatedSlugs?: { [key: string]: string };
@@ -43,62 +43,62 @@ interface PageClientContentProps {
 // }
 
 
-export default function PageClientContent({ initialPageData, currentSlug, children, translatedSlugs }: PageClientContentProps) {
-  const { currentLocale, isLoadingLanguages } = useLanguage();
-  const { currentContent, setCurrentContent } = useCurrentContent();
-  const router = useRouter();
-  // currentPageData is the data for the slug currently in the URL.
-  // It's initially set by the server for the slug it resolved.
-  const [currentPageData, setCurrentPageData] = useState(initialPageData);
-  const [isLoadingTargetLang, setIsLoadingTargetLang] = useState(false);
-  const supabase = useMemo(() => createClient(), []);
+export default function PageClientContent({ initialPageData, currentSlug, children, translatedSlugs }: PageClientContentProps) {
+  const { currentLocale, isLoadingLanguages } = useLanguage();
+  const { currentContent, setCurrentContent } = useCurrentContent();
+  const router = useRouter();
+  // currentPageData is the data for the slug currently in the URL.
+  // It's initially set by the server for the slug it resolved.
+  const [currentPageData, setCurrentPageData] = useState(initialPageData);
+  const [isLoadingTargetLang, setIsLoadingTargetLang] = useState(false);
+  const supabase = useMemo(() => createClient(), []);
 
   // Memoize pageId and pageSlug
-  const pageId = useMemo(() => currentPageData?.id, [currentPageData?.id]);
-  const pageSlug = useMemo(() => currentPageData?.slug, [currentPageData?.id, currentLocale]); // include locale so updates propagate
-
-  useEffect(() => {
-    if (currentLocale && currentPageData && currentPageData.language_code !== currentLocale && translatedSlugs) {
-      // Current page's language doesn't match context, try to navigate to translated version
-      setIsLoadingTargetLang(true);
-      const targetSlug = translatedSlugs[currentLocale];
-      
-      if (targetSlug && targetSlug !== currentSlug) {
-        router.push(`/${targetSlug}`); // Navigate to the translated slug's URL
-      } else if (targetSlug && targetSlug === currentSlug) {
-        // Same slug across languages - refetch the page in the target language and update content
-        (async () => {
-          const { data, error } = await supabase
-            .from("pages")
-            .select("*, languages!inner(code), blocks(*)")
-            .eq("slug", targetSlug)
-            .eq("languages.code", currentLocale)
-            .eq("status", "published")
-            .order('order', { foreignTable: 'blocks', ascending: true })
-            .maybeSingle();
-
-          if (!error && data) {
-            const langInfo = Array.isArray(data.languages) ? data.languages[0] : (data.languages as unknown as { code?: string });
-            setCurrentPageData({
-              ...(data as PageType),
-              blocks: (data as any).blocks || [],
-              language_code: langInfo?.code || currentLocale,
-              language_id: data.language_id,
-              translation_group_id: data.translation_group_id || currentPageData.translation_group_id,
-            } as typeof currentPageData);
-          } else {
-            // fallback to refresh if fetch fails
-            router.refresh();
-          }
-          setIsLoadingTargetLang(false);
-        })();
-      } else {
-        console.warn(`No published translation found for group ${currentPageData.translation_group_id} in language ${currentLocale} using pre-fetched slugs.`);
-        // Optionally, provide feedback to the user that translation is not available
-        setIsLoadingTargetLang(false);
-      }
-    }
-  }, [currentLocale, currentPageData, currentSlug, router, initialPageData, translatedSlugs]); // Rerun if initialPageData changes (e.g. after revalidation)
+  const pageId = useMemo(() => currentPageData?.id, [currentPageData?.id]);
+  const pageSlug = useMemo(() => currentPageData?.slug, [currentPageData?.id, currentLocale]); // include locale so updates propagate
+
+  useEffect(() => {
+    if (currentLocale && currentPageData && currentPageData.language_code !== currentLocale && translatedSlugs) {
+      // Current page's language doesn't match context, try to navigate to translated version
+      setIsLoadingTargetLang(true);
+      const targetSlug = translatedSlugs[currentLocale];
+      
+      if (targetSlug && targetSlug !== currentSlug) {
+        router.push(`/${targetSlug}`); // Navigate to the translated slug's URL
+      } else if (targetSlug && targetSlug === currentSlug) {
+        // Same slug across languages - refetch the page in the target language and update content
+        (async () => {
+          const { data, error } = await supabase
+            .from("pages")
+            .select("*, languages!inner(code), blocks(*)")
+            .eq("slug", targetSlug)
+            .eq("languages.code", currentLocale)
+            .eq("status", "published")
+            .order('order', { foreignTable: 'blocks', ascending: true })
+            .maybeSingle();
+
+          if (!error && data) {
+            const langInfo = Array.isArray(data.languages) ? data.languages[0] : (data.languages as unknown as { code?: string });
+            setCurrentPageData({
+              ...(data as PageType),
+              blocks: (data as any).blocks || [],
+              language_code: langInfo?.code || currentLocale,
+              language_id: data.language_id,
+              translation_group_id: data.translation_group_id || currentPageData.translation_group_id,
+            } as typeof currentPageData);
+          } else {
+            // fallback to refresh if fetch fails
+            router.refresh();
+          }
+          setIsLoadingTargetLang(false);
+        })();
+      } else {
+        console.warn(`No published translation found for group ${currentPageData.translation_group_id} in language ${currentLocale} using pre-fetched slugs.`);
+        // Optionally, provide feedback to the user that translation is not available
+        setIsLoadingTargetLang(false);
+      }
+    }
+  }, [currentLocale, currentPageData, currentSlug, router, initialPageData, translatedSlugs]); // Rerun if initialPageData changes (e.g. after revalidation)
 
   // Update HTML lang attribute based on the *actually displayed* content's language
   useEffect(() => {

package/templates/nextblock-template/app/[slug]/page.tsx

@@ -40,7 +40,7 @@ export async function generateStaticParams(): Promise<ResolvedPageParams[]> {
     console.error("SSG: Error fetching page slugs for static params:", error);
     return [];
   }
-  return pages.map((page: { slug: string }) => ({ slug: page.slug }));
+  return pages.map((page) => ({ slug: page.slug }));
 }
 
 export async function generateMetadata(
@@ -87,8 +87,8 @@ export async function generateMetadata(
 
   const alternates: { [key: string]: string } = {};
   if (languages && pageTranslations) {
-    pageTranslations.forEach((pt: { language_id: string; slug: string }) => {
-      const langInfo = languages.find((l: { id: string; code: string }) => l.id === pt.language_id);
+    pageTranslations.forEach(pt => {
+      const langInfo = languages.find(l => l.id === pt.language_id);
       if (langInfo) {
         alternates[langInfo.code] = `${siteUrl}/${pt.slug}`;
       }
@@ -151,7 +151,7 @@ export default async function DynamicPage({ params: paramsPromise }: PageProps)
   const r2BaseUrl = process.env.NEXT_PUBLIC_R2_BASE_URL || "";
 
   if (pageData && pageData.blocks && r2BaseUrl) {
-    const heroBlock = pageData.blocks.find((block: { block_type: string; content: unknown }) => block.block_type === 'hero');
+    const heroBlock = pageData.blocks.find(block => block.block_type === 'hero');
     if (heroBlock) {
       const heroContent = heroBlock.content as unknown as HeroBlockContent;
       if (

package/templates/nextblock-template/app/cms/blocks/actions.ts

@@ -5,7 +5,7 @@ import { createClient } from "@nextblock-cms/db/server";
 import { revalidatePath } from "next/cache";
 import type { Database, Json } from "@nextblock-cms/db";
 import { getInitialContent, isValidBlockType } from "../../../lib/blocks/blockRegistry";
-import { getFullPageContent, getFullPostContent, type FullPageContent, type FullPostContent } from "../revisions/utils";
+import { getFullPageContent, getFullPostContent } from "../revisions/utils";
 import { createPageRevision, createPostRevision } from "../revisions/service";
 
 type Block = Database['public']['Tables']['blocks']['Row'];
@@ -160,7 +160,7 @@ export async function updateBlock(blockId: number, newContent: unknown, pageId?:
     return { error: "Block not found." };
   }
 
-  let prevContentAggregate: FullPageContent | FullPostContent | null = null;
+  let prevContentAggregate: Awaited<ReturnType<typeof getFullPageContent>> | Awaited<ReturnType<typeof getFullPostContent>> | null = null;
   if (existingBlock.page_id) {
     prevContentAggregate = await getFullPageContent(existingBlock.page_id);
   } else if (existingBlock.post_id) {
@@ -189,7 +189,7 @@ export async function updateBlock(blockId: number, newContent: unknown, pageId?:
     } else if (existingBlock.post_id) {
       const nextContentAggregate = await getFullPostContent(existingBlock.post_id, { overrideBlockId: blockId, overrideBlockContent: newContent });
       if (nextContentAggregate) {
-        await createPostRevision(existingBlock.post_id, user.id, prevContentAggregate as FullPostContent, nextContentAggregate as FullPostContent);
+        await createPostRevision(existingBlock.post_id, user.id, prevContentAggregate as any, nextContentAggregate as any);
       }
     }
   }
@@ -250,7 +250,7 @@ export async function deleteBlock(blockId: number, pageId?: number | null, postI
     return { error: "Block not found." };
   }
 
-  let previousAggregate: FullPageContent | FullPostContent | null = null;
+  let previousAggregate: Awaited<ReturnType<typeof getFullPageContent>> | Awaited<ReturnType<typeof getFullPostContent>> | null = null;
   if (existingBlock.page_id) {
     previousAggregate = await getFullPageContent(existingBlock.page_id);
   } else if (existingBlock.post_id) {
@@ -274,7 +274,7 @@ export async function deleteBlock(blockId: number, pageId?: number | null, postI
     } else if (existingBlock.post_id) {
       const nextAggregate = await getFullPostContent(existingBlock.post_id, { excludeDeletedBlockId: blockId });
       if (nextAggregate) {
-        await createPostRevision(existingBlock.post_id, user.id, previousAggregate as FullPostContent, nextAggregate as FullPostContent);
+        await createPostRevision(existingBlock.post_id, user.id, previousAggregate as any, nextAggregate as any);
       }
     }
   }