create-nextblock 0.2.33 → 0.2.34

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<Record<string, unknown>> | null>(null);
+  const [NestedBlockEditorComponent, setNestedBlockEditorComponent] = useState<ComponentType<any> | null>(null);
   const [tempNestedBlockContent, setTempNestedBlockContent] = useState<Json | null>(null);
 
   useEffect(() => {
@@ -140,30 +140,30 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
   useEffect(() => {
     if (editingNestedBlockInfo) {
       const blockType = editingNestedBlockInfo.blockData.block_type;
-      let SelectedEditor: React.ComponentType<Record<string, unknown>> | null = null;
+      let SelectedEditor: React.ComponentType<any> | null = null;
 
       try {
         switch (blockType) {
           case 'text':
-            SelectedEditor = DynamicTextBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicTextBlockEditor;
             break;
           case 'heading':
-            SelectedEditor = DynamicHeadingBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicHeadingBlockEditor;
             break;
           case 'image':
-            SelectedEditor = DynamicImageBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicImageBlockEditor;
             break;
           case 'button':
-            SelectedEditor = DynamicButtonBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicButtonBlockEditor;
             break;
           case 'posts_grid':
-            SelectedEditor = DynamicPostsGridBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicPostsGridBlockEditor;
             break;
           case 'video_embed':
-            SelectedEditor = DynamicVideoEmbedBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicVideoEmbedBlockEditor;
             break;
           case 'section':
-            SelectedEditor = DynamicSectionBlockEditor as unknown as ComponentType<Record<string, unknown>>;
+            SelectedEditor = DynamicSectionBlockEditor;
             break;
           default:
             console.warn(`No dynamic editor configured for nested block type: ${blockType}`);
@@ -389,10 +389,7 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
           parentBlockId: parentBlockIdStr,
           columnIndex,
           blockIndexInColumn,
-          blockData: {
-            ...nestedBlockData,
-            content: nestedBlockData.content as unknown as Json
-          },
+          blockData: nestedBlockData,
         });
       } else {
         console.error("Nested block not found at specified indices:", { parentBlockIdStr, columnIndex, blockIndexInColumn });
@@ -475,8 +472,8 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
               <EditableBlock
                 block={activeBlock}
                 className="h-full"
-                onDelete={() => {}}
-                onContentChange={() => {}}
+                onDelete={() => {}} // eslint-disable-line @typescript-eslint/no-empty-function
+                onContentChange={() => {}} // eslint-disable-line @typescript-eslint/no-empty-function
               />
             </div>
           ) : null}
@@ -525,7 +522,7 @@ export default function BlockEditorArea({ parentId, parentType, initialBlocks, l
                   if (blockType === "posts_grid") {
                     const fullBlockForEditor: Block = {
                       block_type: editingNestedBlockInfo.blockData.block_type,
-                      content: tempNestedBlockContent as Json,
+                      content: tempNestedBlockContent,
                       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<any>>;
+  EditorComponent: LazyExoticComponent<ComponentType<BlockEditorProps<unknown>>>;
 };
 
 export function BlockEditorModal({

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

@@ -28,19 +28,6 @@ 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,
@@ -98,35 +85,30 @@ function SortableColumnBlock({ block, index, columnIndex, onEdit, onDelete, bloc
         </div>
       </div>
       <div className="text-xs text-gray-500 dark:text-gray-400">
-        {(() => {
-          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>
-              )}
-            </>
-          );
-        })()}
+        {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>
+        )}
       </div>
     </div>
   );
 }
+
+// Column editor component
 export interface ColumnEditorProps {
   columnIndex: number;
   blocks: ColumnBlock[];
@@ -139,7 +121,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<Record<string, unknown>>> | null>(null);
+  const [LazyEditor, setLazyEditor] = useState<React.LazyExoticComponent<React.ComponentType<any>> | null>(null);
   const [isConfirmOpen, setIsConfirmOpen] = useState(false);
   const [blockToDeleteIndex, setBlockToDeleteIndex] = useState<number | null>(null);
 
@@ -152,7 +134,7 @@ export default function ColumnEditor({ columnIndex, blocks, onBlocksChange, bloc
     const initialContent = getInitialContent(selectedBlockType);
     const newBlock: ColumnBlock = {
       block_type: selectedBlockType,
-      content: (initialContent as Record<string, unknown>) || {},
+      content: initialContent || {},
       temp_id: `temp-${Date.now()}-${Math.random()}`
     };
     onBlocksChange([...blocks, newBlock]);
@@ -196,13 +178,13 @@ export default function ColumnEditor({ columnIndex, blocks, onBlocksChange, bloc
     }
   };
 
-  const handleSave = (newContent: unknown) => {
+  const handleSave = (newContent: any) => {
     if (editingBlock === null) return;
 
     const updatedBlocks = [...blocks];
     updatedBlocks[editingBlock.index] = {
       ...updatedBlocks[editingBlock.index],
-      content: newContent as Record<string, unknown>,
+      content: newContent,
     };
     onBlocksChange(updatedBlocks);
     setEditingBlock(null);

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

@@ -16,8 +16,8 @@ import { cn } from '@nextblock-cms/utils';
 export interface EditableBlockProps {
   block: Block;
   onDelete: (blockId: number) => void;
-  onContentChange: (blockId: number, newContent: Record<string, unknown>) => void;
-  dragHandleProps?: Record<string, unknown>;
+  onContentChange: (blockId: number, newContent: Record<string, any>) => void;
+  dragHandleProps?: Record<string, any>;
   onEditNestedBlock?: (parentBlockId: string, columnIndex: number, blockIndexInColumn: number) => void;
   className?: string;
 }
@@ -34,7 +34,7 @@ export default function EditableBlock({
   // 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<Record<string, unknown>>> | null>(null);
+  const [LazyEditor, setLazyEditor] = useState<LazyExoticComponent<ComponentType<any>> | 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, unknown>) => onContentChange(block.id, newContent)} blockType={block.block_type as 'section' | 'hero'} isConfigPanelOpen={isConfigPanelOpen} />}
+            {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} />}
           </Suspense>
         </div>
       ) : renderPreview()}
@@ -170,8 +170,8 @@ export default function EditableBlock({
             setEditingBlock(null);
             setLazyEditor(null);
           }}
-          onSave={(newContent: unknown) => {
-            onContentChange(block.id, newContent as Record<string, unknown>);
+          onSave={(newContent: any) => {
+            onContentChange(block.id, newContent);
             setEditingBlock(null);
             setLazyEditor(null);
           }}

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

@@ -38,19 +38,6 @@ 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,
@@ -80,9 +67,8 @@ export default function SectionBlockEditor({
   }, [content]);
 
 
-  type ColumnBlock = SectionBlockContent['column_blocks'][0][0];
   const [activeId, setActiveId] = useState<string | null>(null);
-  const [draggedBlock, setDraggedBlock] = useState<ColumnBlock | null>(null);
+  const [draggedBlock, setDraggedBlock] = useState<any>(null);
 
   // DND sensors for cross-column dragging
   const sensors = useSensors(
@@ -306,47 +292,40 @@ return (
                   </span>
                 </div>
                 <div className="text-xs text-blue-600 dark:text-blue-400 mt-1">
-                  {(() => {
-                    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>
-                        )}
-                      </>
-                    );
-                  })()}
+                  {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>
+                  )}
                 </div>
               </div>
             ) : null}

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

@@ -1,81 +1,81 @@
-// app/cms/blocks/editors/TextBlockEditor.tsx
-'use client';
-
-import React, { useId, useState, useRef, useCallback } from 'react';
-import dynamic from 'next/dynamic';
-import MediaPickerDialog from '@/app/cms/media/components/MediaPickerDialog';
-import { Label } from '@nextblock-cms/ui';
-import { BlockEditorProps } from '../components/BlockEditorModal';
-
-// Props expected by NotionEditor
-type NotionEditorProps = {
-  content: string;
-  onChange: (html: string) => void;
-  openImagePicker?: () => Promise<{ src: string; alt?: string; width?: number | null; height?: number | null; blurDataURL?: string | null } | null>;
-};
-
-// Use the alias that resolves in your repo; if you mapped @nextblock-cms/editor, swap it here.
-const NotionEditor = dynamic<NotionEditorProps>(
-  () => import('@nextblock-cms/editor').then((m) => m.NotionEditor),
-  { ssr: false }
-);
-
-export type TextBlockContent = {
-  html_content?: string;
-};
-
-export default function TextBlockEditor({
-  content,
-  onChange,
-}: BlockEditorProps<Partial<TextBlockContent>>) {
-  const labelId = useId();
-  const [pickerOpen, setPickerOpen] = useState(false);
-  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);
-    return new Promise<{ src: string; alt?: string; width?: number | null; height?: number | null; blurDataURL?: string | null } | null>((resolve) => {
-      resolverRef.current = resolve;
-    });
-  }, []);
-
-  return (
-    <div className="h-full flex flex-col">
-      <Label htmlFor={labelId} className="sr-only">
-        Text Content
-      </Label>
-
-      <div id={labelId} role="group" aria-labelledby={labelId} className="flex-1 min-h-0 flex flex-col">
-        <NotionEditor
-          content={content?.html_content ?? ''}
-          onChange={(html) => onChange({ html_content: html })}
-          openImagePicker={openImagePicker}
-        />
-
-        {/* Hidden controlled MediaPickerDialog for image selection */}
-        <div className="sr-only" aria-hidden>
-          <MediaPickerDialog
-            hideTrigger
-            open={pickerOpen}
-            onOpenChange={setPickerOpen}
-            title="Select or Upload Image"
-            accept={(m) => !!m.file_type?.startsWith('image/')}
-            onSelect={(media) => {
-              const src = `${R2_BASE_URL}/${media.object_key}`;
-              resolverRef.current?.({
-                src,
-                alt: media.description || media.file_name || undefined,
-                width: media.width ?? null,
-                height: media.height ?? null,
-                blurDataURL: media.blur_data_url ?? null,
-              });
-              resolverRef.current = null;
-              setPickerOpen(false);
-            }}
-          />
-        </div>
-      </div>
-    </div>
-  );
-}
-
+// app/cms/blocks/editors/TextBlockEditor.tsx
+'use client';
+
+import React, { useId, useState, useRef, useCallback } from 'react';
+import dynamic from 'next/dynamic';
+import MediaPickerDialog from '@/app/cms/media/components/MediaPickerDialog';
+import { Label } from '@nextblock-cms/ui';
+import { BlockEditorProps } from '../components/BlockEditorModal';
+
+// Props expected by NotionEditor
+type NotionEditorProps = {
+  content: string;
+  onChange: (html: string) => void;
+  openImagePicker?: () => Promise<{ src: string; alt?: string; width?: number | null; height?: number | null; blurDataURL?: string | null } | null>;
+};
+
+// Use the alias that resolves in your repo; if you mapped @nextblock-cms/editor, swap it here.
+const NotionEditor = dynamic<NotionEditorProps>(
+  () => import('@nextblock-cms/editor').then((m) => m.NotionEditor),
+  { ssr: false }
+);
+
+export type TextBlockContent = {
+  html_content?: string;
+};
+
+export default function TextBlockEditor({
+  content,
+  onChange,
+}: BlockEditorProps<Partial<TextBlockContent>>) {
+  const labelId = useId();
+  const [pickerOpen, setPickerOpen] = useState(false);
+  const resolverRef = useRef<null | ((v: any) => void)>(null);
+  const R2_BASE_URL = process.env.NEXT_PUBLIC_R2_BASE_URL || '';
+  const openImagePicker = useCallback(() => {
+    setPickerOpen(true);
+    return new Promise<{ src: string; alt?: string; width?: number | null; height?: number | null; blurDataURL?: string | null } | null>((resolve) => {
+      resolverRef.current = resolve;
+    });
+  }, []);
+
+  return (
+    <div className="h-full flex flex-col">
+      <Label htmlFor={labelId} className="sr-only">
+        Text Content
+      </Label>
+
+      <div id={labelId} role="group" aria-labelledby={labelId} className="flex-1 min-h-0 flex flex-col">
+        <NotionEditor
+          content={content?.html_content ?? ''}
+          onChange={(html) => onChange({ html_content: html })}
+          openImagePicker={openImagePicker}
+        />
+
+        {/* Hidden controlled MediaPickerDialog for image selection */}
+        <div className="sr-only" aria-hidden>
+          <MediaPickerDialog
+            hideTrigger
+            open={pickerOpen}
+            onOpenChange={setPickerOpen}
+            title="Select or Upload Image"
+            accept={(m) => !!m.file_type?.startsWith('image/')}
+            onSelect={(media) => {
+              const src = `${R2_BASE_URL}/${media.object_key}`;
+              resolverRef.current?.({
+                src,
+                alt: media.description || media.file_name || undefined,
+                width: media.width ?? null,
+                height: media.height ?? null,
+                blurDataURL: media.blur_data_url ?? null,
+              });
+              resolverRef.current = null;
+              setPickerOpen(false);
+            }}
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+

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, Json } from "@nextblock-cms/db";
+import type { Database } 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 unknown as Json, // Store all variants including the original
+    variants: allVariantsToStore as any, // 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
   };
@@ -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 = 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[]) : []);
+      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) : []);
 
       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: unknown) {
-          const name = (err as Error)?.name || '';
-          const message = (err as Error)?.message || String(err);
+        } catch (err: any) {
+          const name = err?.name || '';
+          const message = err?.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 };
+          const updated = { ...v, objectKey: updatedKey } as any;
           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 unknown as Json })
+        .update({ object_key: newMainKey, file_path: newMainKey, folder, variants: newVariants as any })
         .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: 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));
+    } catch (err: any) {
+      const msg = err?.name && err?.message ? `${err.name}: ${err.message}` : (err?.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 ('error' in res && res.error) {
+        if ((res as any)?.error) {
           // Accumulate errors but keep going
           hadError = true;
-          setMoveError((prev) => (prev ? prev + " | " : "") + res.error);
+          setMoveError((prev) => (prev ? prev + " | " : "") + (res as any).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 };
+            return { ...m, object_key: `${folder}${filename}`, folder } as any;
           }));
         }
         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 { digest?: unknown })?.digest === 'string' && ((err as { digest: string }).digest.startsWith('NEXT_REDIRECT')));
+        const isRedirect = (err instanceof Error && err.message === 'NEXT_REDIRECT') || (typeof (err as any)?.digest === 'string' && (err as any).digest.startsWith('NEXT_REDIRECT'));
 
         if (isRedirect && !returnJustData) {
           setUploadStatus("success");