create-nextblock 0.2.30 → 0.2.33

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/eslint.config.mjs

@@ -1,16 +1,11 @@
-import nx from '@nx/eslint-plugin';
 import nextPlugin from '@next/eslint-plugin-next';
-
-const nextRules = {
-  ...nextPlugin.configs.recommended.rules,
-  ...nextPlugin.configs['core-web-vitals'].rules,
-};
+import tseslint from 'typescript-eslint';
 
 const config = [
-  ...nx.configs['flat/react-typescript'],
   {
-    ignores: ['.next/**/*', '**/next-env.d.ts', 'apps/nextblock/next-env.d.ts'],
+    ignores: ['.next/**/*', '**/next-env.d.ts', 'next-env.d.ts'],
   },
+  ...tseslint.configs.recommended,
   {
     files: [
       '**/*.ts',
@@ -20,12 +15,21 @@ const config = [
       '**/*.mjs',
       '**/*.cjs',
     ],
+    languageOptions: {
+      parserOptions: {
+        project: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
+    },
     plugins: {
       '@next/next': nextPlugin,
     },
     rules: {
-      ...nextRules,
-      '@next/next/no-html-link-for-pages': ['error', 'apps/nextblock/app'],
+      ...nextPlugin.configs.recommended.rules,
+      ...nextPlugin.configs['core-web-vitals'].rules,
+      '@next/next/no-html-link-for-pages': 'off',
+      '@typescript-eslint/no-unused-vars': ['error', { argsIgnorePattern: '^_' }],
+      '@typescript-eslint/no-explicit-any': 'warn',
     },
   },
 ];

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.8",
+  "version": "0.2.11",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -9,7 +9,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.810.0",
+    "@aws-sdk/client-s3": "^3.920.0",
+    "@aws-sdk/s3-request-presigner": "^3.920.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
@@ -47,6 +48,7 @@
     "eslint-config-next": "^15.5.4",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
-    "typescript": "~5.8.2"
+    "typescript": "~5.8.2",
+    "typescript-eslint": "^8.0.0"
   }
 }