create-nextblock 0.2.30 → 0.2.31

package/package.json

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

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

@@ -1,18 +1,18 @@
 // app/[slug]/page.tsx
 import React from 'react';
 import { getSsgSupabaseClient } from "@nextblock-cms/db/server";
-import { notFound } from "next/navigation";
-import type { Metadata } from 'next';
+import { notFound } from "next/navigation";
+import type { Metadata } from 'next';
 import PageClientContent from "./PageClientContent";
-import { getPageDataBySlug } from "./page.utils";
-import BlockRenderer from "../../components/BlockRenderer";
-import type { HeroBlockContent } from '../../lib/blocks/blockRegistry';
-import { cookies, headers } from "next/headers";
+import { getPageDataBySlug } from "./page.utils";
+import BlockRenderer from "../../components/BlockRenderer";
+import type { HeroBlockContent } from '../../lib/blocks/blockRegistry';
+import { cookies, headers } from "next/headers";
 
-export const dynamicParams = true;
-export const revalidate = 360;
-export const dynamic = 'force-dynamic'; // keeps per-request locale; paired with short revalidate
-export const fetchCache = 'force-no-store';
+export const dynamicParams = true;
+export const revalidate = 360;
+export const dynamic = 'force-dynamic'; // keeps per-request locale; paired with short revalidate
+export const fetchCache = 'force-no-store';
 
 interface ResolvedPageParams {
   slug: string;
@@ -40,30 +40,30 @@ export async function generateStaticParams(): Promise<ResolvedPageParams[]> {
     console.error("SSG: Error fetching page slugs for static params:", error);
     return [];
   }
-  return pages.map((page) => ({ slug: page.slug }));
+  return pages.map((page: { slug: string }) => ({ slug: page.slug }));
 }
 
-export async function generateMetadata(
-  { params: paramsPromise }: PageProps,
-): Promise<Metadata> {
-  const params = await paramsPromise;
-  let preferredLocale: string | undefined;
-  try {
-    const store = await cookies();
-    preferredLocale = store.get("NEXT_USER_LOCALE")?.value || store.get("NEXT_LOCALE")?.value;
-  } catch {
-    preferredLocale = undefined;
-  }
-  if (!preferredLocale) {
-    try {
-      const hdrs = await headers();
-      const al = hdrs.get("accept-language");
-      if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
-    } catch {
-      // ignore header lookup errors
-    }
-  }
-  const pageData = await getPageDataBySlug(params.slug, preferredLocale);
+export async function generateMetadata(
+  { params: paramsPromise }: PageProps,
+): Promise<Metadata> {
+  const params = await paramsPromise;
+  let preferredLocale: string | undefined;
+  try {
+    const store = await cookies();
+    preferredLocale = store.get("NEXT_USER_LOCALE")?.value || store.get("NEXT_LOCALE")?.value;
+  } catch {
+    preferredLocale = undefined;
+  }
+  if (!preferredLocale) {
+    try {
+      const hdrs = await headers();
+      const al = hdrs.get("accept-language");
+      if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
+    } catch {
+      // ignore header lookup errors
+    }
+  }
+  const pageData = await getPageDataBySlug(params.slug, preferredLocale);
 
   if (!pageData) {
     return { title: "Page Not Found" };
@@ -87,8 +87,8 @@ export async function generateMetadata(
 
   const alternates: { [key: string]: string } = {};
   if (languages && pageTranslations) {
-    pageTranslations.forEach(pt => {
-      const langInfo = languages.find(l => l.id === pt.language_id);
+    pageTranslations.forEach((pt: { language_id: string; slug: string }) => {
+      const langInfo = languages.find((l: { id: string; code: string }) => l.id === pt.language_id);
       if (langInfo) {
         alternates[langInfo.code] = `${siteUrl}/${pt.slug}`;
       }
@@ -105,25 +105,25 @@ export async function generateMetadata(
   };
 }
 
-export default async function DynamicPage({ params: paramsPromise }: PageProps) {
-  const params = await paramsPromise;
-  let preferredLocale: string | undefined;
-  try {
-    const store = await cookies();
-    preferredLocale = store.get("NEXT_USER_LOCALE")?.value || store.get("NEXT_LOCALE")?.value;
-  } catch {
-    preferredLocale = undefined;
-  }
-  if (!preferredLocale) {
-    try {
-      const hdrs = await headers();
-      const al = hdrs.get("accept-language");
-      if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
-    } catch {
-      // ignore header lookup errors
-    }
-  }
-  const pageData = await getPageDataBySlug(params.slug, preferredLocale);
+export default async function DynamicPage({ params: paramsPromise }: PageProps) {
+  const params = await paramsPromise;
+  let preferredLocale: string | undefined;
+  try {
+    const store = await cookies();
+    preferredLocale = store.get("NEXT_USER_LOCALE")?.value || store.get("NEXT_LOCALE")?.value;
+  } catch {
+    preferredLocale = undefined;
+  }
+  if (!preferredLocale) {
+    try {
+      const hdrs = await headers();
+      const al = hdrs.get("accept-language");
+      if (al) preferredLocale = al.split(",")[0]?.split("-")[0];
+    } catch {
+      // ignore header lookup errors
+    }
+  }
+  const pageData = await getPageDataBySlug(params.slug, preferredLocale);
 
   if (!pageData) {
     notFound();
@@ -151,7 +151,7 @@ export default async function DynamicPage({ params: paramsPromise }: PageProps)
   const r2BaseUrl = process.env.NEXT_PUBLIC_R2_BASE_URL || "";
 
   if (pageData && pageData.blocks && r2BaseUrl) {
-    const heroBlock = pageData.blocks.find(block => block.block_type === 'hero');
+    const heroBlock = pageData.blocks.find((block: { block_type: string; content: unknown }) => block.block_type === 'hero');
     if (heroBlock) {
       const heroContent = heroBlock.content as unknown as HeroBlockContent;
       if (
@@ -177,4 +177,4 @@ export default async function DynamicPage({ params: paramsPromise }: PageProps)
       </PageClientContent>
     </>
   );
-}
+}

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextblock-cms/template",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "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"
   }
 }