create-nextblock 0.2.31 → 0.2.33

package/package.json

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

package/scripts/sync-template.js

@@ -36,16 +36,17 @@ const UI_PROXY_MODULES = [
   'ui',
 ];
 
-const IGNORED_SEGMENTS = new Set([
-  'node_modules',
-  '.git',
-  '.next',
-  'dist',
-  'tmp',
-  'coverage',
-  'backup',
-  'backups',
-]);
+const IGNORED_SEGMENTS = new Set([
+  'node_modules',
+  '.git',
+  '.next',
+  'dist',
+  'tmp',
+  'coverage',
+  'backup',
+  'backups',
+]);
+
 
 async function ensureTemplateSync() {
   const sourceExists = await fs.pathExists(SOURCE_DIR);
@@ -64,7 +65,7 @@ async function ensureTemplateSync() {
   );
 
   await fs.ensureDir(TARGET_DIR);
-  await fs.emptyDir(TARGET_DIR);
+  await emptyDirWithRetry(TARGET_DIR);
 
   await fs.copy(SOURCE_DIR, TARGET_DIR, {
     dereference: true,
@@ -79,10 +80,10 @@ async function ensureTemplateSync() {
     },
   });
 
-  await ensureEnvExample();
-  await ensureTemplateGitignore();
-  await ensureGlobalStyles();
-  await ensureClientTranslations();
+  await ensureEnvExample();
+  await ensureTemplateGitignore();
+  await ensureGlobalStyles();
+  await ensureClientTranslations();
   await sanitizeBlockEditorImports();
   await sanitizeUiImports();
   await ensureUiProxies();
@@ -92,7 +93,7 @@ async function ensureTemplateSync() {
   console.log(chalk.green('Template sync complete.'));
 }
 
-async function ensureEnvExample() {
+async function ensureEnvExample() {
   const envTargets = [
     resolve(REPO_ROOT, '.env.example'),
     resolve(REPO_ROOT, '.env.exemple'),
@@ -118,42 +119,42 @@ NEXT_PUBLIC_URL=http://localhost:3000
 `;
 
   await fs.writeFile(destination, placeholder);
-}
-
-async function ensureTemplateGitignore() {
-  const destination = resolve(TARGET_DIR, '.gitignore');
-  const content = `.DS_Store
-node_modules
-dist
-.next
-out
-build
-coverage
-*.log
-logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-.env
-.env.*
-.env.local
-.env.development.local
-.env.production.local
-.env.test.local
-
-.vscode
-.idea
-.swp
-*.sw?
-
-supabase/.temp
-supabase/.branches
-`;
-  await fs.outputFile(destination, content);
-}
-
+}
+
+async function ensureTemplateGitignore() {
+  const destination = resolve(TARGET_DIR, '.gitignore');
+  const content = `.DS_Store
+node_modules
+dist
+.next
+out
+build
+coverage
+*.log
+logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+.env
+.env.*
+.env.local
+.env.development.local
+.env.production.local
+.env.test.local
+
+.vscode
+.idea
+.swp
+*.sw?
+
+supabase/.temp
+supabase/.branches
+`;
+  await fs.outputFile(destination, content);
+}
+
 async function ensureGlobalStyles() {
   const destination = resolve(TARGET_DIR, 'app/globals.css');
 
@@ -312,3 +313,20 @@ ensureTemplateSync().catch((error) => {
   console.error(chalk.red(error instanceof Error ? error.message : String(error)));
   process.exit(1);
 });
+
+async function emptyDirWithRetry(dir, retries = 5, delay = 1000) {
+  for (let i = 0; i < retries; i++) {
+    try {
+      await fs.emptyDir(dir);
+      return;
+    } catch (err) {
+      if (i === retries - 1) throw err;
+      if (err.code === 'EBUSY' || err.code === 'EPERM') {
+        console.log(chalk.yellow(`Locked file encountered. Retrying in ${delay}ms... (${i + 1}/${retries})`));
+        await new Promise((resolve) => setTimeout(resolve, delay));
+      } else {
+        throw err;
+      }
+    }
+  }
+}

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

@@ -5,22 +5,22 @@ 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 } from "../revisions/utils";
+import { getFullPageContent, getFullPostContent, type FullPageContent, type FullPostContent } from "../revisions/utils";
 import { createPageRevision, createPostRevision } from "../revisions/service";
 
 type Block = Database['public']['Tables']['blocks']['Row'];
 type BlockType = Database['public']['Tables']['blocks']['Row']['block_type'];
 
 // Helper to verify user can edit the parent (page/post)
-async function canEditParent(
-  supabase: ReturnType<typeof createClient>,
-  userId: string,
-  pageId?: number | null,
-  postId?: number | null
-): Promise<boolean> {
-  void pageId;
-  void postId;
-  const { data: profile } = await supabase
+async function canEditParent(
+  supabase: ReturnType<typeof createClient>,
+  userId: string,
+  pageId?: number | null,
+  postId?: number | null
+): Promise<boolean> {
+  void pageId;
+  void postId;
+  const { data: profile } = await supabase
     .from("profiles")
     .select("role")
     .eq("id", userId)
@@ -160,7 +160,7 @@ export async function updateBlock(blockId: number, newContent: unknown, pageId?:
     return { error: "Block not found." };
   }
 
-  let prevContentAggregate: Awaited<ReturnType<typeof getFullPageContent>> | Awaited<ReturnType<typeof getFullPostContent>> | null = null;
+  let prevContentAggregate: FullPageContent | FullPostContent | 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 any, nextContentAggregate as any);
+        await createPostRevision(existingBlock.post_id, user.id, prevContentAggregate as FullPostContent, nextContentAggregate as FullPostContent);
       }
     }
   }
@@ -250,7 +250,7 @@ export async function deleteBlock(blockId: number, pageId?: number | null, postI
     return { error: "Block not found." };
   }
 
-  let previousAggregate: Awaited<ReturnType<typeof getFullPageContent>> | Awaited<ReturnType<typeof getFullPostContent>> | null = null;
+  let previousAggregate: FullPageContent | FullPostContent | 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 any, nextAggregate as any);
+        await createPostRevision(existingBlock.post_id, user.id, previousAggregate as FullPostContent, nextAggregate as FullPostContent);
       }
     }
   }
@@ -418,7 +418,7 @@ export async function copyBlocksFromLanguage(
             console.warn("Could not fetch target post slug for revalidation:", postError);
         } else {
             targetSlug = postData.slug;
-            if (targetSlug) revalidatePath(`/article/${targetSlug}`);
+            if (targetSlug) revalidatePath(`/article/${targetSlug}`);
         }
         revalidatePath(`/cms/posts/${parentId}/edit`); // Revalidate edit page
     }

package/templates/nextblock-template/app/cms/blocks/components/BackgroundSelector.tsx

@@ -21,6 +21,8 @@ interface BackgroundSelectorProps {
   onChange: (newBackground: SectionBlockContent["background"]) => void;
 }
 
+type ChangeEventLike = { target: { name: string; value: string } };
+
 export default function BackgroundSelector({ background, onChange }: BackgroundSelectorProps) {
 
   const backgroundType = background?.type || "none";
@@ -127,12 +129,12 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
     }
   };
 
-  const handleBackgroundPropertyChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleBackgroundPropertyChange = (e: ChangeEventLike) => {
     const { name, value } = e.target;
     onChange({ ...background, [name]: value });
   };
 
-  const handleOverlayGradientChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleOverlayGradientChange = (e: ChangeEventLike) => {
     const { name, value } = e.target;
     if (background?.type === "image" && background.image) {
       const { image } = background;
@@ -170,7 +172,7 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
       <div className="space-y-4">
         <div className="grid gap-2">
           <Label>Background Type</Label>
-          <Select value={backgroundType} onValueChange={(v) => handleTypeChange(v as any)}>
+          <Select value={backgroundType} onValueChange={(v) => handleTypeChange(v as SectionBlockContent["background"]["type"])}>
             <SelectTrigger className="w-full max-w-[250px]"><SelectValue placeholder="Select type" /></SelectTrigger>
             <SelectContent>
               <SelectItem value="none">None</SelectItem>
@@ -184,7 +186,7 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
           <Label htmlFor="min_height">Minimum Height (e.g., 250px)</Label>
           <div className="flex items-center gap-2">
             <Input id="min_height" name="min_height" value={minHeight} onChange={(e) => setMinHeight(e.target.value)} placeholder="e.g., 250px" className="max-w-[200px]" />
-            <Button type="button" variant="ghost" size="icon" onClick={() => handleBackgroundPropertyChange({ target: { name: "min_height", value: minHeight } } as any)} disabled={!hasMinHeightChanged} title="Save Minimum Height">
+            <Button type="button" variant="ghost" size="icon" onClick={() => handleBackgroundPropertyChange({ target: { name: "min_height", value: minHeight } })} disabled={!hasMinHeightChanged} title="Save Minimum Height">
               <Save className={cn("h-5 w-5", hasMinHeightChanged && "text-green-600")} />
             </Button>
           </div>
@@ -272,7 +274,7 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
                       ]}
                     />
                   </div>
-                  <Button size="icon" variant="ghost" onClick={() => handleOverlayGradientChange({ target: { name: "direction", value: overlayDirection } } as any)} disabled={!hasOverlayDirectionChanged} title="Save Overlay Direction">
+                  <Button size="icon" variant="ghost" onClick={() => handleOverlayGradientChange({ target: { name: "direction", value: overlayDirection } })} disabled={!hasOverlayDirectionChanged} title="Save Overlay Direction">
                     <Save className={cn("h-5 w-5 mt-[1.3rem]", hasOverlayDirectionChanged && "text-green-600")} />
                   </Button>
                 </div>
@@ -280,12 +282,12 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
                   <ColorPicker
                     label="Start Color"
                     color={selectedImage.overlay.gradient?.stops?.[0]?.color || "rgba(0,0,0,0.5)"}
-                    onChange={(color) => handleOverlayGradientChange({ target: { name: "startColor", value: color } } as any)}
+                    onChange={(color) => handleOverlayGradientChange({ target: { name: "startColor", value: color } })}
                   />
                   <ColorPicker
                     label="End Color"
                     color={selectedImage.overlay.gradient?.stops?.[1]?.color || "rgba(0,0,0,0)"}
-                    onChange={(color) => handleOverlayGradientChange({ target: { name: "endColor", value: color } } as any)}
+                    onChange={(color) => handleOverlayGradientChange({ target: { name: "endColor", value: color } })}
                   />
                 </div>
               </div>
@@ -300,7 +302,7 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
                 label="Direction"
                 tooltipContent="Select a preset or enter a custom angle like '45deg' or 'to top left'. See MDN's linear-gradient docs for more options."
                 value={background.gradient?.direction || "to right"}
-                onChange={(value: string) => handleBackgroundGradientChange({ target: { name: "direction", value } } as any)}
+                onChange={(value: string) => handleBackgroundGradientChange({ target: { name: "direction", value } })}
                 options={[
                   { value: "to right", label: "To Right" },
                   { value: "to left", label: "To Left" },
@@ -315,12 +317,12 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
               <ColorPicker
                 label="Start Color"
                 color={background.gradient?.stops?.[0]?.color || "#3b82f6"}
-                onChange={(color) => handleBackgroundGradientChange({ target: { name: "startColor", value: color } } as any)}
+                onChange={(color) => handleBackgroundGradientChange({ target: { name: "startColor", value: color } })}
               />
               <ColorPicker
                 label="End Color"
                 color={background.gradient?.stops?.[1]?.color || "#8b5cf6"}
-                onChange={(color) => handleBackgroundGradientChange({ target: { name: "endColor", value: color } } as any)}
+                onChange={(color) => handleBackgroundGradientChange({ target: { name: "endColor", value: color } })}
               />
             </div>
           </div>
@@ -328,8 +330,8 @@ export default function BackgroundSelector({ background, onChange }: BackgroundS
       </div>
     </TooltipProvider>
   );
-  const handleBackgroundGradientChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const { name, value } = e.target as any;
+  const handleBackgroundGradientChange = (e: ChangeEventLike) => {
+    const { name, value } = e.target;
     if (backgroundType !== 'gradient') return;
     const current = background.gradient || { type: 'linear' as const, direction: 'to right', stops: [ { color: '#3b82f6', position: 0 }, { color: '#8b5cf6', position: 100 } ] };
     if (name === 'direction') {

package/templates/nextblock-template/app/cms/blocks/components/BlockEditorArea.tsx

@@ -82,7 +82,7 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
   const [activeBlock, setActiveBlock] = useState<Block | null>(null);
   const [insertionIndex, setInsertionIndex] = useState<number | null>(null);
   const [editingNestedBlockInfo, setEditingNestedBlockInfo] = useState<EditingNestedBlockInfo | null>(null);
-  const [NestedBlockEditorComponent, setNestedBlockEditorComponent] = useState<ComponentType<any> | null>(null);
+  const [NestedBlockEditorComponent, setNestedBlockEditorComponent] = useState<ComponentType<Record<string, unknown>> | null>(null);
   const [tempNestedBlockContent, setTempNestedBlockContent] = useState<Json | null>(null);
 
   useEffect(() => {
@@ -129,41 +129,41 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
     debouncedSave(updatedBlock);
   };
 
-  const DynamicTextBlockEditor = dynamic(() => import('../editors/TextBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
-  const DynamicHeadingBlockEditor = dynamic(() => import('../editors/HeadingBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
-  const DynamicImageBlockEditor = dynamic(() => import('../editors/ImageBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
-  const DynamicButtonBlockEditor = dynamic(() => import('../editors/ButtonBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
-  const DynamicPostsGridBlockEditor = dynamic(() => import('../editors/PostsGridBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
-  const DynamicVideoEmbedBlockEditor = dynamic(() => import('../editors/VideoEmbedBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
-  const DynamicSectionBlockEditor = dynamic(() => import('../editors/SectionBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicTextBlockEditor = dynamic(() => import('../editors/TextBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicHeadingBlockEditor = dynamic(() => import('../editors/HeadingBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicImageBlockEditor = dynamic(() => import('../editors/ImageBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicButtonBlockEditor = dynamic(() => import('../editors/ButtonBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicPostsGridBlockEditor = dynamic(() => import('../editors/PostsGridBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicVideoEmbedBlockEditor = dynamic(() => import('../editors/VideoEmbedBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
+  const DynamicSectionBlockEditor = dynamic(() => import('../editors/SectionBlockEditor').then(mod => mod.default), { loading: () => <p>Loading editor...</p> });
 
   useEffect(() => {
     if (editingNestedBlockInfo) {
       const blockType = editingNestedBlockInfo.blockData.block_type;
-      let SelectedEditor: React.ComponentType<any> | null = null;
+      let SelectedEditor: React.ComponentType<Record<string, unknown>> | null = null;
 
       try {
         switch (blockType) {
           case 'text':
-            SelectedEditor = DynamicTextBlockEditor;
+            SelectedEditor = DynamicTextBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           case 'heading':
-            SelectedEditor = DynamicHeadingBlockEditor;
+            SelectedEditor = DynamicHeadingBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           case 'image':
-            SelectedEditor = DynamicImageBlockEditor;
+            SelectedEditor = DynamicImageBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           case 'button':
-            SelectedEditor = DynamicButtonBlockEditor;
+            SelectedEditor = DynamicButtonBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           case 'posts_grid':
-            SelectedEditor = DynamicPostsGridBlockEditor;
+            SelectedEditor = DynamicPostsGridBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           case 'video_embed':
-            SelectedEditor = DynamicVideoEmbedBlockEditor;
+            SelectedEditor = DynamicVideoEmbedBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           case 'section':
-            SelectedEditor = DynamicSectionBlockEditor;
+            SelectedEditor = DynamicSectionBlockEditor as unknown as ComponentType<Record<string, unknown>>;
             break;
           default:
             console.warn(`No dynamic editor configured for nested block type: ${blockType}`);
@@ -389,7 +389,10 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
           parentBlockId: parentBlockIdStr,
           columnIndex,
           blockIndexInColumn,
-          blockData: nestedBlockData,
+          blockData: {
+            ...nestedBlockData,
+            content: nestedBlockData.content as unknown as Json
+          },
         });
       } else {
         console.error("Nested block not found at specified indices:", { parentBlockIdStr, columnIndex, blockIndexInColumn });
@@ -444,7 +447,7 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
                   onContentChange={handleContentChange}
                   onDelete={async (blockIdToDelete) => {
                     startTransition(async () => {
-                      const result = await import("../actions").then(({ deleteBlock }) =>
+                      const result = await import("../actions").then(({ deleteBlock }) =>
                         deleteBlock(
                           blockIdToDelete,
                           parentType === "page" ? parentId : null,
@@ -472,8 +475,8 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
               <EditableBlock
                 block={activeBlock}
                 className="h-full"
-                onDelete={() => {}} // eslint-disable-line @typescript-eslint/no-empty-function
-                onContentChange={() => {}} // eslint-disable-line @typescript-eslint/no-empty-function
+                onDelete={() => {}}
+                onContentChange={() => {}}
               />
             </div>
           ) : null}
@@ -522,7 +525,7 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
                   if (blockType === "posts_grid") {
                     const fullBlockForEditor: Block = {
                       block_type: editingNestedBlockInfo.blockData.block_type,
-                      content: tempNestedBlockContent,
+                      content: tempNestedBlockContent as Json,
                       id: 0, // Temporary ID for nested blocks
                       language_id: languageId,
                       order: 0, // Temporary order for nested blocks

package/templates/nextblock-template/app/cms/blocks/components/BlockEditorModal.tsx

@@ -33,7 +33,7 @@ type BlockEditorModalProps = {
   isOpen: boolean;
   onClose: () => void;
   onSave: (updatedContent: unknown) => void;
-  EditorComponent: LazyExoticComponent<ComponentType<BlockEditorProps<unknown>>>;
+  EditorComponent: LazyExoticComponent<ComponentType<any>>;
 };
 
 export function BlockEditorModal({

package/templates/nextblock-template/app/cms/blocks/components/ColumnEditor.tsx

@@ -28,6 +28,19 @@ interface SortableColumnBlockProps {
   onClick: (e: React.MouseEvent<HTMLDivElement>) => void;
 }
 
+type AnyBlockContent = {
+  html_content?: string;
+  text_content?: string;
+  level?: number;
+  alt_text?: string;
+  media_id?: string;
+  text?: string;
+  url?: string;
+  title?: string;
+  columns?: number;
+  postsPerPage?: number;
+};
+
 function SortableColumnBlock({ block, index, columnIndex, onEdit, onDelete, blockType, onClick }: SortableColumnBlockProps) {
   const {
     attributes,
@@ -85,30 +98,35 @@ function SortableColumnBlock({ block, index, columnIndex, onEdit, onDelete, bloc
         </div>
       </div>
       <div className="text-xs text-gray-500 dark:text-gray-400">
-        {block.block_type === 'text' && (
-          <div dangerouslySetInnerHTML={{ __html: (block.content.html_content || 'Empty text').substring(0, 50) + (block.content.html_content && block.content.html_content.length > 50 ? '...' : '') }} />
-        )}
-        {block.block_type === 'heading' && (
-          <div>H{block.content.level || 1}: {(block.content.text_content || 'Empty heading').substring(0, 30) + (block.content.text_content && block.content.text_content.length > 30 ? '...' : '')}</div>
-        )}
-        {block.block_type === 'image' && (
-          <div>Image: {block.content.alt_text || block.content.media_id ? 'Image selected' : 'No image selected'}</div>
-        )}
-        {block.block_type === 'button' && (
-          <div>Button: {block.content.text || 'No text'} → {block.content.url || '#'}</div>
-        )}
-        {block.block_type === 'video_embed' && (
-          <div>Video: {block.content.title || block.content.url || 'No URL set'}</div>
-        )}
-        {block.block_type === 'posts_grid' && (
-          <div>Posts Grid: {block.content.columns || 3} cols, {block.content.postsPerPage || 12} posts</div>
-        )}
+        {(() => {
+          const content = block.content as AnyBlockContent;
+          return (
+            <>
+              {block.block_type === 'text' && (
+                <div dangerouslySetInnerHTML={{ __html: (content.html_content || 'Empty text').substring(0, 50) + (content.html_content && content.html_content.length > 50 ? '...' : '') }} />
+              )}
+              {block.block_type === 'heading' && (
+                <div>H{content.level || 1}: {(content.text_content || 'Empty heading').substring(0, 30) + (content.text_content && content.text_content.length > 30 ? '...' : '')}</div>
+              )}
+              {block.block_type === 'image' && (
+                <div>Image: {content.alt_text || content.media_id ? 'Image selected' : 'No image selected'}</div>
+              )}
+              {block.block_type === 'button' && (
+                <div>Button: {content.text || 'No text'} → {content.url || '#'}</div>
+              )}
+              {block.block_type === 'video_embed' && (
+                <div>Video: {content.title || content.url || 'No URL set'}</div>
+              )}
+              {block.block_type === 'posts_grid' && (
+                <div>Posts Grid: {content.columns || 3} cols, {content.postsPerPage || 12} posts</div>
+              )}
+            </>
+          );
+        })()}
       </div>
     </div>
   );
 }
-
-// Column editor component
 export interface ColumnEditorProps {
   columnIndex: number;
   blocks: ColumnBlock[];
@@ -121,7 +139,7 @@ type EditingBlock = ColumnBlock & { index: number };
 export default function ColumnEditor({ columnIndex, blocks, onBlocksChange, blockType }: ColumnEditorProps) {
   const [editingBlock, setEditingBlock] = useState<EditingBlock | null>(null);
   const [isBlockSelectorOpen, setIsBlockSelectorOpen] = useState(false);
-  const [LazyEditor, setLazyEditor] = useState<React.LazyExoticComponent<React.ComponentType<any>> | null>(null);
+  const [LazyEditor, setLazyEditor] = useState<React.LazyExoticComponent<React.ComponentType<Record<string, unknown>>> | null>(null);
   const [isConfirmOpen, setIsConfirmOpen] = useState(false);
   const [blockToDeleteIndex, setBlockToDeleteIndex] = useState<number | null>(null);
 
@@ -134,7 +152,7 @@ export default function ColumnEditor({ columnIndex, blocks, onBlocksChange, bloc
     const initialContent = getInitialContent(selectedBlockType);
     const newBlock: ColumnBlock = {
       block_type: selectedBlockType,
-      content: initialContent || {},
+      content: (initialContent as Record<string, unknown>) || {},
       temp_id: `temp-${Date.now()}-${Math.random()}`
     };
     onBlocksChange([...blocks, newBlock]);
@@ -178,13 +196,13 @@ export default function ColumnEditor({ columnIndex, blocks, onBlocksChange, bloc
     }
   };
 
-  const handleSave = (newContent: any) => {
+  const handleSave = (newContent: unknown) => {
     if (editingBlock === null) return;
 
     const updatedBlocks = [...blocks];
     updatedBlocks[editingBlock.index] = {
       ...updatedBlocks[editingBlock.index],
-      content: newContent,
+      content: newContent as Record<string, unknown>,
     };
     onBlocksChange(updatedBlocks);
     setEditingBlock(null);

package/templates/nextblock-template/app/cms/blocks/components/EditableBlock.tsx

@@ -16,25 +16,25 @@ import { cn } from '@nextblock-cms/utils';
 export interface EditableBlockProps {
   block: Block;
   onDelete: (blockId: number) => void;
-  onContentChange: (blockId: number, newContent: Record<string, any>) => void;
-  dragHandleProps?: Record<string, any>;
+  onContentChange: (blockId: number, newContent: Record<string, unknown>) => void;
+  dragHandleProps?: Record<string, unknown>;
   onEditNestedBlock?: (parentBlockId: string, columnIndex: number, blockIndexInColumn: number) => void;
   className?: string;
 }
 
-export default function EditableBlock({
-  block,
-  onDelete,
-  onContentChange,
-  dragHandleProps,
-  onEditNestedBlock,
-  className,
-}: EditableBlockProps) {
-  void onEditNestedBlock;
-  // Move all hooks to the top before any conditional returns
+export default function EditableBlock({
+  block,
+  onDelete,
+  onContentChange,
+  dragHandleProps,
+  onEditNestedBlock,
+  className,
+}: EditableBlockProps) {
+  void onEditNestedBlock;
+  // Move all hooks to the top before any conditional returns
   const [isConfigPanelOpen, setIsConfigPanelOpen] = useState(false);
   const [editingBlock, setEditingBlock] = useState<Block | null>(null);
-  const [LazyEditor, setLazyEditor] = useState<LazyExoticComponent<ComponentType<any>> | null>(null);
+  const [LazyEditor, setLazyEditor] = useState<LazyExoticComponent<ComponentType<Record<string, unknown>>> | null>(null);
 
   const SectionEditor = useMemo(() => {
     if (block?.block_type === 'section' || block?.block_type === 'hero') {
@@ -156,7 +156,7 @@ export default function EditableBlock({
       {isSection ? (
         <div className="mt-2 min-h-[200px]">
           <Suspense fallback={<div className="flex justify-center items-center h-full"><p>Loading Editor...</p></div>}>
-            {SectionEditor && <SectionEditor block={block} content={block.content || {}} onChange={(newContent: Record<string, any>) => onContentChange(block.id, newContent)} blockType={block.block_type as 'section' | 'hero'} isConfigPanelOpen={isConfigPanelOpen} />}
+            {SectionEditor && <SectionEditor block={block} content={block.content || {}} onChange={(newContent: Record<string, unknown>) => onContentChange(block.id, newContent)} blockType={block.block_type as 'section' | 'hero'} isConfigPanelOpen={isConfigPanelOpen} />}
           </Suspense>
         </div>
       ) : renderPreview()}
@@ -170,8 +170,8 @@ export default function EditableBlock({
             setEditingBlock(null);
             setLazyEditor(null);
           }}
-          onSave={(newContent: any) => {
-            onContentChange(block.id, newContent);
+          onSave={(newContent: unknown) => {
+            onContentChange(block.id, newContent as Record<string, unknown>);
             setEditingBlock(null);
             setLazyEditor(null);
           }}

package/templates/nextblock-template/app/cms/blocks/editors/SectionBlockEditor.tsx

@@ -38,6 +38,19 @@ interface SectionBlockEditorProps {
   blockType: 'section' | 'hero';
 }
 
+type AnyBlockContent = {
+  html_content?: string;
+  text_content?: string;
+  level?: number;
+  alt_text?: string;
+  media_id?: string;
+  text?: string;
+  url?: string;
+  title?: string;
+  columns?: number;
+  postsPerPage?: number;
+};
+
 export default function SectionBlockEditor({
   content,
   onChange,
@@ -67,8 +80,9 @@ export default function SectionBlockEditor({
   }, [content]);
 
 
+  type ColumnBlock = SectionBlockContent['column_blocks'][0][0];
   const [activeId, setActiveId] = useState<string | null>(null);
-  const [draggedBlock, setDraggedBlock] = useState<any>(null);
+  const [draggedBlock, setDraggedBlock] = useState<ColumnBlock | null>(null);
 
   // DND sensors for cross-column dragging
   const sensors = useSensors(
@@ -292,40 +306,47 @@ return (
                   </span>
                 </div>
                 <div className="text-xs text-blue-600 dark:text-blue-400 mt-1">
-                  {draggedBlock.block_type === "text" && (
-                    <div
-                      dangerouslySetInnerHTML={{
-                        __html:
-                          (
-                            draggedBlock.content.html_content || "Empty text"
-                          ).substring(0, 30) + "...",
-                      }}
-                    />
-                  )}
-                  {draggedBlock.block_type === "heading" && (
-                    <div>
-                      H{draggedBlock.content.level || 1}:{" "}
-                      {(
-                        draggedBlock.content.text_content || "Empty heading"
-                      ).substring(0, 20) + "..."}
-                    </div>
-                  )}
-                  {draggedBlock.block_type === "image" && (
-                    <div>
-                      Image: {draggedBlock.content.alt_text || "No alt text"}
-                    </div>
-                  )}
-                  {draggedBlock.block_type === "button" && (
-                    <div>Button: {draggedBlock.content.text || "No text"}</div>
-                  )}
-                  {draggedBlock.block_type === "video_embed" && (
-                    <div>Video: {draggedBlock.content.title || "No title"}</div>
-                  )}
-                  {draggedBlock.block_type === "posts_grid" && (
-                    <div>
-                      Posts Grid: {draggedBlock.content.columns || 3} cols
-                    </div>
-                  )}
+                  {(() => {
+                    const content = draggedBlock.content as AnyBlockContent;
+                    return (
+                      <>
+                        {draggedBlock.block_type === "text" && (
+                          <div
+                            dangerouslySetInnerHTML={{
+                              __html:
+                                (
+                                  content.html_content || "Empty text"
+                                ).substring(0, 30) + "...",
+                            }}
+                          />
+                        )}
+                        {draggedBlock.block_type === "heading" && (
+                          <div>
+                            H{content.level || 1}:{" "}
+                            {(
+                              content.text_content || "Empty heading"
+                            ).substring(0, 20) + "..."}
+                          </div>
+                        )}
+                        {draggedBlock.block_type === "image" && (
+                          <div>
+                            Image: {content.alt_text || "No alt text"}
+                          </div>
+                        )}
+                        {draggedBlock.block_type === "button" && (
+                          <div>Button: {content.text || "No text"}</div>
+                        )}
+                        {draggedBlock.block_type === "video_embed" && (
+                          <div>Video: {content.title || "No title"}</div>
+                        )}
+                        {draggedBlock.block_type === "posts_grid" && (
+                          <div>
+                            Posts Grid: {content.columns || 3} cols
+                          </div>
+                        )}
+                      </>
+                    );
+                  })()}
                 </div>
               </div>
             ) : null}

package/templates/nextblock-template/app/cms/blocks/editors/TextBlockEditor.tsx

@@ -30,7 +30,7 @@ export default function TextBlockEditor({
 }: BlockEditorProps<Partial<TextBlockContent>>) {
   const labelId = useId();
   const [pickerOpen, setPickerOpen] = useState(false);
-  const resolverRef = useRef<null | ((v: any) => void)>(null);
+  const resolverRef = useRef<null | ((v: { src: string; alt?: string; width?: number | null; height?: number | null; blurDataURL?: string | null }) => void)>(null);
   const R2_BASE_URL = process.env.NEXT_PUBLIC_R2_BASE_URL || '';
   const openImagePicker = useCallback(() => {
     setPickerOpen(true);

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

@@ -3,7 +3,7 @@
 
 import { createClient } from "@nextblock-cms/db/server";
 import { revalidatePath } from "next/cache";
-import type { Database } from "@nextblock-cms/db";
+import type { Database, Json } from "@nextblock-cms/db";
 import { encodedRedirect } from "@nextblock-cms/utils/server";
 
 type Media = Database['public']['Tables']['media']['Row'];
@@ -111,7 +111,7 @@ export async function recordMediaUpload(payload: {
     description: computedDescription,
     width: primaryVariant.width,
     height: primaryVariant.height,
-    variants: allVariantsToStore as any, // Store all variants including the original
+    variants: allVariantsToStore as unknown as Json, // Store all variants including the original
     blur_data_url: payload.blurDataUrl || null, // Store if provided
     // Ensure all other required fields for 'Media' type are present or nullable
   };
@@ -201,24 +201,24 @@ export async function deleteMediaItem(mediaId: string, objectKey: string) {
         return encodedRedirect("error", "/cms/media", "Forbidden: Insufficient permissions.");
     }
 
-    const { DeleteObjectCommand } = await import("@aws-sdk/client-s3");
-    const { getS3Client } = await import("@nextblock-cms/utils/server");
-    const s3Client = await getS3Client();
-    const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
-
-    if (!R2_BUCKET_NAME) {
-      return encodedRedirect("error", "/cms/media", "R2 Bucket not configured for deletion.");
-    }
-    if (!s3Client) {
-      return encodedRedirect("error", "/cms/media", "R2 client is not configured for deletion.");
-    }
+    const { DeleteObjectCommand } = await import("@aws-sdk/client-s3");
+    const { getS3Client } = await import("@nextblock-cms/utils/server");
+    const s3Client = await getS3Client();
+    const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
+
+    if (!R2_BUCKET_NAME) {
+      return encodedRedirect("error", "/cms/media", "R2 Bucket not configured for deletion.");
+    }
+    if (!s3Client) {
+      return encodedRedirect("error", "/cms/media", "R2 client is not configured for deletion.");
+    }
 
     try {
         const deleteCommand = new DeleteObjectCommand({
             Bucket: R2_BUCKET_NAME,
             Key: objectKey,
         });
-        await s3Client.send(deleteCommand);
+        await s3Client.send(deleteCommand);
     } catch (r2Error: unknown) {
         console.error("Error deleting from R2:", r2Error);
         // Decide if you want to proceed with DB deletion if R2 deletion fails
@@ -255,17 +255,17 @@ export async function deleteMultipleMediaItems(items: Array<{ id: string; object
     return { error: "No items selected for deletion." };
   }
 
-  const { DeleteObjectsCommand } = await import("@aws-sdk/client-s3"); // Use DeleteObjects for batch
-  const { getS3Client } = await import("@nextblock-cms/utils/server");
-  const s3Client = await getS3Client();
-  const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
-
-  if (!R2_BUCKET_NAME) {
-    return { error: "R2 Bucket not configured for deletion." };
-  }
-  if (!s3Client) {
-    return { error: "R2 client is not configured for deletion." };
-  }
+  const { DeleteObjectsCommand } = await import("@aws-sdk/client-s3"); // Use DeleteObjects for batch
+  const { getS3Client } = await import("@nextblock-cms/utils/server");
+  const s3Client = await getS3Client();
+  const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
+
+  if (!R2_BUCKET_NAME) {
+    return { error: "R2 Bucket not configured for deletion." };
+  }
+  if (!s3Client) {
+    return { error: "R2 client is not configured for deletion." };
+  }
 
   const r2ObjectsToDelete = items.map(item => ({ Key: item.objectKey }));
   const itemIdsToDelete = items.map(item => item.id);
@@ -345,18 +345,18 @@ export async function moveMultipleMediaItems(
   };
   const folder = sanitizeFolder(destinationFolder);
 
-  const { CopyObjectCommand, DeleteObjectCommand, ListObjectsV2Command, HeadObjectCommand } = await import("@aws-sdk/client-s3");
-  const { getS3Client } = await import("@nextblock-cms/utils/server");
-  const s3Client = await getS3Client();
-  const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
-  const R2_PUBLIC_URL_BASE = process.env.NEXT_PUBLIC_R2_BASE_URL || '';
-
-  if (!R2_BUCKET_NAME) {
-    return { error: "R2 Bucket not configured for move." };
-  }
-  if (!s3Client) {
-    return { error: "R2 client is not configured for move." };
-  }
+  const { CopyObjectCommand, DeleteObjectCommand, ListObjectsV2Command, HeadObjectCommand } = await import("@aws-sdk/client-s3");
+  const { getS3Client } = await import("@nextblock-cms/utils/server");
+  const s3Client = await getS3Client();
+  const R2_BUCKET_NAME = process.env.R2_BUCKET_NAME;
+  const R2_PUBLIC_URL_BASE = process.env.NEXT_PUBLIC_R2_BASE_URL || '';
+
+  if (!R2_BUCKET_NAME) {
+    return { error: "R2 Bucket not configured for move." };
+  }
+  if (!s3Client) {
+    return { error: "R2 client is not configured for move." };
+  }
 
   if (!items || items.length === 0) {
     return { error: "No items selected for move." };
@@ -382,9 +382,9 @@ export async function moveMultipleMediaItems(
       let newMainKey = `${folder}${getFilename(mediaRow.object_key)}`;
 
       // Build list of keys to move: primary + variant keys (if any)
-      type Variant = { objectKey: string; url?: string; [k: string]: any };
-      const oldVariants: Variant[] = Array.isArray(mediaRow.variants) ? (mediaRow.variants as Variant[]) :
-        (typeof mediaRow.variants === 'object' && mediaRow.variants !== null ? (mediaRow.variants as any) : []);
+      type Variant = ImageVariant & { [k: string]: unknown };
+      const oldVariants: Variant[] = Array.isArray(mediaRow.variants) ? (mediaRow.variants as unknown as Variant[]) :
+        (typeof mediaRow.variants === 'object' && mediaRow.variants !== null ? (mediaRow.variants as unknown as Variant[]) : []);
 
       const variantMoves = (oldVariants || []).map((v) => ({
         oldKey: v.objectKey,
@@ -429,9 +429,9 @@ export async function moveMultipleMediaItems(
           await s3Client.send(new DeleteObjectCommand({ Bucket: R2_BUCKET_NAME, Key: oldKey }));
           movedKeys.add(oldKey);
           if (isMain) mainMoved = true;
-        } catch (err: any) {
-          const name = err?.name || '';
-          const message = err?.message || String(err);
+        } catch (err: unknown) {
+          const name = (err as Error)?.name || '';
+          const message = (err as Error)?.message || String(err);
           if (isMain) {
             // Main object missing: attempt fallback to any existing variant
             let promoted = false;
@@ -499,7 +499,7 @@ export async function moveMultipleMediaItems(
         .map((v) => {
           const filename = getFilename(v.objectKey);
           const updatedKey = `${folder}${filename}`;
-          const updated = { ...v, objectKey: updatedKey } as any;
+          const updated = { ...v, objectKey: updatedKey };
           if (R2_PUBLIC_URL_BASE) updated.url = `${R2_PUBLIC_URL_BASE}/${updatedKey}`;
           return updated;
         });
@@ -507,7 +507,7 @@ export async function moveMultipleMediaItems(
       // Update DB
       const { error: updateError } = await supabase
         .from('media')
-        .update({ object_key: newMainKey, file_path: newMainKey, folder, variants: newVariants as any })
+        .update({ object_key: newMainKey, file_path: newMainKey, folder, variants: newVariants as unknown as Json })
         .eq('id', item.id);
       if (updateError) {
         results.push({ id: item.id, ok: false, error: updateError.message });
@@ -515,8 +515,8 @@ export async function moveMultipleMediaItems(
       }
 
       results.push({ id: item.id, ok: true });
-    } catch (err: any) {
-      const msg = err?.name && err?.message ? `${err.name}: ${err.message}` : (err?.message || String(err));
+    } catch (err: unknown) {
+      const msg = (err as Error)?.name && (err as Error)?.message ? `${(err as Error).name}: ${(err as Error).message}` : ((err as Error)?.message || String(err));
       results.push({ id: item.id, ok: false, error: msg });
     }
   }

package/templates/nextblock-template/app/cms/media/components/MediaGridClient.tsx

@@ -103,17 +103,17 @@ export default function MediaGridClient({ initialMediaItems, r2BaseUrl }: MediaG
       let hadError = false;
       for (const item of selectedItems) {
         const res = await moveSingleMediaItem(item, dest);
-        if ((res as any)?.error) {
+        if ('error' in res && res.error) {
           // Accumulate errors but keep going
           hadError = true;
-          setMoveError((prev) => (prev ? prev + " | " : "") + (res as any).error);
+          setMoveError((prev) => (prev ? prev + " | " : "") + res.error);
         } else {
           // Update local list
           setMediaItems((prev) => prev.map((m) => {
             if (m.id !== item.id) return m;
             const filename = m.object_key.substring(m.object_key.lastIndexOf('/') + 1);
             const folder = ensureFolderSlash(dest);
-            return { ...m, object_key: `${folder}${filename}`, folder } as any;
+            return { ...m, object_key: `${folder}${filename}`, folder };
           }));
         }
         moved += 1;

package/templates/nextblock-template/app/cms/media/components/MediaUploadForm.tsx

@@ -259,7 +259,7 @@ export default function MediaUploadForm({ onUploadSuccess, returnJustData, defau
         }
 
       } catch (err: unknown) {
-        const isRedirect = (err instanceof Error && err.message === 'NEXT_REDIRECT') || (typeof (err as any)?.digest === 'string' && (err as any).digest.startsWith('NEXT_REDIRECT'));
+        const isRedirect = (err instanceof Error && err.message === 'NEXT_REDIRECT') || (typeof (err as { digest?: unknown })?.digest === 'string' && ((err as { digest: string }).digest.startsWith('NEXT_REDIRECT')));
 
         if (isRedirect && !returnJustData) {
           setUploadStatus("success");

package/templates/nextblock-template/app/cms/media/page.tsx

@@ -51,8 +51,8 @@ async function getDistinctFolders(search?: string): Promise<string[]> {
     return [];
   }
   let folders = (data || [])
-    .map((r: any) => r.folder)
-    .filter((f: any) => typeof f === 'string' && f.length > 0);
+    .map((r) => r.folder)
+    .filter((f): f is string => typeof f === 'string' && f.length > 0);
   if (search && search.trim()) {
     const t = search.trim().toLowerCase();
     folders = folders.filter((f: string) => f.toLowerCase().includes(t));
@@ -71,7 +71,7 @@ async function getFolderCounts(): Promise<Record<string, number>> {
     return {};
   }
   const counts: Record<string, number> = {};
-  (data || []).forEach((row: any) => {
+  (data || []).forEach((row) => {
     const f: string | null = row.folder;
     if (!f || typeof f !== 'string' || f.length === 0) return;
     const norm = f.endsWith('/') ? f : `${f}/`;

package/templates/nextblock-template/app/cms/revisions/JsonDiffView.tsx

@@ -1,4 +1,3 @@
-// apps/nextblock/app/cms/revisions/JsonDiffView.tsx
 "use client";
 
 import React, { useMemo } from 'react';
@@ -11,10 +10,11 @@ interface JsonDiffViewProps {
   rightTitle?: string;
 }
 
-function getByPointer(obj: any, pointer: string): any {
+function getByPointer(obj: unknown, pointer: string): unknown {
   if (!pointer || pointer === '/') return obj;
   const parts = pointer.split('/').slice(1).map(p => p.replace(/~1/g, '/').replace(/~0/g, '~'));
-  let cur = obj;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let cur = obj as any;
   for (const part of parts) {
     if (cur == null) return undefined;
     cur = cur[part];
@@ -22,7 +22,7 @@ function getByPointer(obj: any, pointer: string): any {
   return cur;
 }
 
-function safeStringify(v: any): string {
+function safeStringify(v: unknown): string {
   try {
     return JSON.stringify(v, null, 2);
   } catch {
@@ -32,10 +32,11 @@ function safeStringify(v: any): string {
 
 export default function JsonDiffView({ oldValue, newValue, leftTitle = 'Current', rightTitle = 'Selected' }: JsonDiffViewProps) {
   const { ops, oldObj } = useMemo(() => {
-    let a: any = null, b: any = null;
+    let a: unknown = null, b: unknown = null;
     try { a = JSON.parse(oldValue); } catch { a = oldValue; }
     try { b = JSON.parse(newValue); } catch { b = newValue; }
-    const operations: Operation[] = compare(a, b);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const operations: Operation[] = compare(a as any, b as any);
     return { ops: operations, oldObj: a };
   }, [oldValue, newValue]);
 
@@ -56,7 +57,7 @@ export default function JsonDiffView({ oldValue, newValue, leftTitle = 'Current'
         {ops.map((op, idx) => {
           const oldAtPath = op.op !== 'add' ? getByPointer(oldObj, op.path) : undefined;
           const oldStr = op.op !== 'add' ? safeStringify(oldAtPath) : '';
-          const newStr = op.op !== 'remove' ? safeStringify((op as any).value) : '';
+          const newStr = op.op !== 'remove' && 'value' in op ? safeStringify((op as { value: unknown }).value) : '';
           return (
             <div key={idx} className="rounded border">
               <div className="px-2 py-1 border-b flex items-center gap-2 text-xs">

package/templates/nextblock-template/app/cms/revisions/RevisionHistoryButton.tsx

@@ -54,18 +54,24 @@ export default function RevisionHistoryButton({ parentType, parentId }: Revision
       try {
         if (parentType === 'page') {
           const res = await listPageRevisions(parentId);
-        if ('error' in res) {
-          setError(res.error ?? 'Unknown error');
-          setRevisions(null);
-          setCurrentVersion(null);
-        } else {
-          setRevisions(res.revisions as unknown as RevisionItem[]);
-          setCurrentVersion((res as any).currentVersion ?? null);
-        }
+          if ('error' in res) {
+            setError(res.error ?? 'Unknown error');
+            setRevisions(null);
+            setCurrentVersion(null);
+          } else {
+            setRevisions(res.revisions as unknown as RevisionItem[]);
+            setCurrentVersion(res.currentVersion ?? null);
+          }
         } else {
           const res = await listPostRevisions(parentId);
-          if ('error' in res) { setError(res.error ?? 'Unknown error'); setRevisions(null); setCurrentVersion(null); }
-          else { setRevisions(res.revisions as unknown as RevisionItem[]); setCurrentVersion((res as any).currentVersion ?? null); }
+          if ('error' in res) {
+            setError(res.error ?? 'Unknown error');
+            setRevisions(null);
+            setCurrentVersion(null);
+          } else {
+            setRevisions(res.revisions as unknown as RevisionItem[]);
+            setCurrentVersion(res.currentVersion ?? null);
+          }
         }
       } catch (e: unknown) {
         setError(e instanceof Error ? e.message : 'Failed to load revisions');

package/templates/nextblock-template/app/cms/revisions/service.ts

@@ -3,7 +3,7 @@
 
 import { createClient } from "@nextblock-cms/db/server";
 import type { Json } from "@nextblock-cms/db";
-import { compare, applyPatch } from 'fast-json-patch';
+import { compare, applyPatch, type Operation } from 'fast-json-patch';
 import type { FullPageContent, FullPostContent } from './utils';
 
 
@@ -120,8 +120,8 @@ export async function restorePageToVersion(pageId: number, targetVersion: number
 
   for (const r of diffs || []) {
     if (r.revision_type === 'diff') {
-      const ops = r.content as any[];
-      const result = applyPatch(content as any, ops, /*validate*/ false, /*mutateDocument*/ true);
+      const ops = r.content as unknown as Operation[];
+      const result = applyPatch(content as unknown as Record<string, unknown>, ops, /*validate*/ false, /*mutateDocument*/ true);
       content = result.newDocument as unknown as FullPageContent;
     } else {
       content = r.content as unknown as FullPageContent;
@@ -208,8 +208,8 @@ export async function restorePostToVersion(postId: number, targetVersion: number
 
   for (const r of diffs || []) {
     if (r.revision_type === 'diff') {
-      const ops = r.content as any[];
-      const result = applyPatch(content as any, ops, /*validate*/ false, /*mutateDocument*/ true);
+      const ops = r.content as unknown as Operation[];
+      const result = applyPatch(content as unknown as Record<string, unknown>, ops, /*validate*/ false, /*mutateDocument*/ true);
       content = result.newDocument as unknown as FullPostContent;
     } else {
       content = r.content as unknown as FullPostContent;
@@ -296,8 +296,8 @@ export async function reconstructPageVersionContent(pageId: number, targetVersio
 
   for (const r of diffs || []) {
     if (r.revision_type === 'diff') {
-      const ops = r.content as any[];
-      const result = applyPatch(content as any, ops, false, true);
+      const ops = r.content as unknown as Operation[];
+      const result = applyPatch(content as unknown as Record<string, unknown>, ops, false, true);
       content = result.newDocument as unknown as FullPageContent;
     } else {
       content = r.content as unknown as FullPageContent;
@@ -333,8 +333,8 @@ export async function reconstructPostVersionContent(postId: number, targetVersio
 
   for (const r of diffs || []) {
     if (r.revision_type === 'diff') {
-      const ops = r.content as any[];
-      const result = applyPatch(content as any, ops, false, true);
+      const ops = r.content as unknown as Operation[];
+      const result = applyPatch(content as unknown as Record<string, unknown>, ops, false, true);
       content = result.newDocument as unknown as FullPostContent;
     } else {
       content = r.content as unknown as FullPostContent;

package/templates/nextblock-template/app/cms/settings/extra-translations/actions.ts

@@ -59,7 +59,7 @@ export async function getTranslations() {
 
 export async function updateTranslation(prevState: unknown, formData: FormData) {
   const supabase = createClient();
-  const data = Object.fromEntries(formData as any);
+  const data = Object.fromEntries(formData.entries());
   const key = data.key as string;
 
   if (!key) {

package/templates/nextblock-template/app/cms/settings/logos/[id]/edit/page.tsx

@@ -13,6 +13,7 @@ export default async function EditLogoPage(props: { params: Promise<{ id: string
   return (
     <div>
       <h1 className="text-2xl font-semibold mb-6">Edit Logo</h1>
+      {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
       <LogoForm logo={logo} action={updateLogo as any} />
     </div>
   )

package/templates/nextblock-template/lib/blocks/blockRegistry.ts

@@ -117,21 +117,21 @@ export interface SectionBlockContent {
     solid_color?: string;
     min_height?: string;
     gradient?: Gradient;
-    image?: {
-      media_id: string;
-      object_key: string;
-      alt_text?: string;
-      width?: number;
-      height?: number;
-      blur_data_url?: string;
-      size: 'cover' | 'contain';
-      position: 'center' | 'top' | 'bottom' | 'left' | 'right';
-      quality?: number | null;
-      overlay?: {
-        type: 'gradient';
-        gradient: Gradient;
-      };
-    };
+    image?: {
+      media_id: string;
+      object_key: string;
+      alt_text?: string;
+      width?: number;
+      height?: number;
+      blur_data_url?: string;
+      size: 'cover' | 'contain';
+      position: 'center' | 'top' | 'bottom' | 'left' | 'right';
+      quality?: number | null;
+      overlay?: {
+        type: 'gradient';
+        gradient: Gradient;
+      };
+    };
   };
   /** Responsive column configuration */
   responsive_columns: {
@@ -149,7 +149,7 @@ export interface SectionBlockContent {
   /** Array of blocks within columns - 2D array where each index represents a column */
   column_blocks: Array<Array<{
     block_type: BlockType;
-    content: Record<string, any>;
+    content: Record<string, unknown>;
     temp_id?: string; // For client-side management before save
   }>>;
 }
@@ -211,7 +211,7 @@ export interface ContentPropertyDefinition {
   /** Human-readable description of the property */
   description?: string;
   /** Default value for the property */
-  default?: any;
+  default?: unknown;
   /** For union types, the possible values */
   unionValues?: readonly string[];
   /** For array types, the type of array elements */
@@ -221,7 +221,7 @@ export interface ContentPropertyDefinition {
     min?: number;
     max?: number;
     pattern?: string;
-    enum?: readonly any[];
+    enum?: readonly unknown[];
   };
 }
 
@@ -229,7 +229,7 @@ export interface ContentPropertyDefinition {
  * Enhanced block definition interface with generic type parameter
  * Links the TypeScript interface to the block definition for better type safety
  */
-export interface BlockDefinition<T = any> {
+export interface BlockDefinition<T = unknown> {
   /** The unique identifier for the block type */
   type: BlockType;
   /** User-friendly display name for the block */
@@ -799,7 +799,7 @@ export function getBlockDefinition(blockType: BlockType): BlockDefinition | unde
  * @param blockType - The type of block to get initial content for
  * @returns The initial content object or undefined if block type not found
  */
-export function getInitialContent(blockType: BlockType): object | undefined {
+export function getInitialContent(blockType: BlockType): unknown {
   return blockRegistry[blockType]?.initialContent;
 }
 
@@ -870,7 +870,7 @@ export type AllBlockContent =
  */
 export function validateBlockContent(
   blockType: BlockType, 
-  content: Record<string, any>
+  content: Record<string, unknown>
 ): { 
   isValid: boolean; 
   errors: string[]; 
@@ -972,9 +972,9 @@ export function getRequiredProperties(blockType: BlockType): string[] {
   const schema = getContentSchema(blockType);
   if (!schema) return [];
   
-  return Object.entries(schema)
-    .filter(([, def]) => def.required)
-    .map(([name]) => name);
+  return Object.entries(schema)
+    .filter(([, def]) => def.required)
+    .map(([name]) => name);
 }
 
 /**
@@ -984,13 +984,13 @@ export function getRequiredProperties(blockType: BlockType): string[] {
  * @param blockType - The type of block
  * @returns Complete default content object
  */
-export function generateDefaultContent(blockType: BlockType): Record<string, any> {
+export function generateDefaultContent(blockType: BlockType): Record<string, unknown> {
   const schema = getContentSchema(blockType);
-  const initialContent = getInitialContent(blockType) || {};
+  const initialContent = getInitialContent(blockType) || ({} as Record<string, unknown>);
   
-  if (!schema) return initialContent;
+  if (!schema) return initialContent as Record<string, unknown>;
 
-  const defaultContent: Record<string, any> = { ...initialContent };
+  const defaultContent: Record<string, unknown> = { ...(initialContent as Record<string, unknown>) };
 
   for (const [propertyName, propertyDef] of Object.entries(schema)) {
     if (defaultContent[propertyName] === undefined && propertyDef.default !== undefined) {
@@ -999,4 +999,4 @@ export function generateDefaultContent(blockType: BlockType): Record<string, any
   }
 
   return defaultContent;
-}
+}

package/templates/nextblock-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/template",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "private": true,
   "scripts": {
     "dev": "next dev",