create-nextblock 0.2.31 → 0.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nextblock",
-  "version": "0.2.31",
+  "version": "0.2.34",
   "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/[slug]/PageClientContent.tsx

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

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

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

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

@@ -12,15 +12,15 @@ 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)
@@ -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
     }