create-nextblock 0.2.26 → 0.2.29

package/bin/create-nextblock.js

@@ -177,19 +177,22 @@ async function runSetupWizard(projectDir, projectName) {
   const projectPath = resolve(projectDir);
   process.chdir(projectPath);
 
-  clack.intro('🚀 Welcome to the NextBlock setup wizard!');
-
-  const supabaseDir = resolve(projectPath, 'supabase');
-  await fs.ensureDir(supabaseDir);
-  await resetSupabaseProjectRef(projectPath);
-
-  clack.note(
-    'Supabase Prerequisites:\n\nBefore proceeding, ensure you have a Supabase project ready.\n\nSupabase Cloud: Create a project at https://supabase.com/dashboard\n\nVercel Storage: If created via Vercel > Storage > Create Database, check your .env.local snippet on Vercel for the required keys.',
-  );
-
-  clack.note('Connecting to Supabase...');
-  clack.note('I will now open your browser to log into Supabase.');
-  await runSupabaseCli(['login'], { cwd: projectPath });
+  clack.intro('🚀 Welcome to the NextBlock setup wizard!');
+
+  const supabaseDir = resolve(projectPath, 'supabase');
+  await fs.ensureDir(supabaseDir);
+  await resetSupabaseProjectRef(projectPath);
+
+  clack.note(
+    "Before proceeding, ensure you have a Supabase project ready.\n\n" +
+    "1. Supabase Cloud: Create a project at https://supabase.com/dashboard\n" +
+    "2. Vercel Storage: If created via Vercel > Storage, check your .env.local snippet on Vercel for keys.",
+    "Supabase Prerequisites"
+  );
+
+  clack.note('Connecting to Supabase...');
+  clack.note('I will now open your browser to log into Supabase.');
+  await runSupabaseCli(['login'], { cwd: projectPath });
 
   clack.note('Now, please select your NextBlock project when prompted.');
   await runSupabaseCli(['link'], { cwd: projectPath });
@@ -230,27 +233,27 @@ async function runSetupWizard(projectDir, projectName) {
   const siteUrl = siteUrlPrompt.trim();
 
   clack.note('Please go to your Supabase project dashboard to get the following secrets.');
-  const supabaseKeys = await clack.group(
-    {
-      dbPassword: () =>
-        clack.password({
-          message:
-            'What is your Database Password? (Supabase: Database > Database Settings > Reset database password | Vercel: POSTGRES_PASSWORD)',
-          validate: (val) => (!val ? 'Password is required' : undefined),
-        }),
-      anonKey: () =>
-        clack.password({
-          message:
-            'What is your Project API Key (anon key)? (Supabase: Project Settings > API Keys > Project Legacy API Keys | Vercel: SUPABASE_ANON_KEY)',
-          validate: (val) => (!val ? 'Anon Key is required' : undefined),
-        }),
-      serviceKey: () =>
-        clack.password({
-          message:
-            'What is your Service Role Key (service_role key)? (Supabase: Project Settings > API Keys > Project Legacy API Keys | Vercel: SUPABASE_SERVICE_ROLE_KEY)',
-          validate: (val) => (!val ? 'Service Role Key is required' : undefined),
-        }),
-    },
+  const supabaseKeys = await clack.group(
+    {
+      dbPassword: () =>
+        clack.password({
+          message:
+            'What is your Database Password? (Supabase: Database > Database Settings > Reset database password | Vercel: POSTGRES_PASSWORD)',
+          validate: (val) => (!val ? 'Password is required' : undefined),
+        }),
+      anonKey: () =>
+        clack.password({
+          message:
+            'What is your Project API Key (anon key)? (Supabase: Project Settings > API Keys > Project Legacy API Keys | Vercel: SUPABASE_ANON_KEY)',
+          validate: (val) => (!val ? 'Anon Key is required' : undefined),
+        }),
+      serviceKey: () =>
+        clack.password({
+          message:
+            'What is your Service Role Key (service_role key)? (Supabase: Project Settings > API Keys > Project Legacy API Keys | Vercel: SUPABASE_SERVICE_ROLE_KEY)',
+          validate: (val) => (!val ? 'Service Role Key is required' : undefined),
+        }),
+    },
     { onCancel: () => handleWizardCancel('Setup cancelled.') },
   );
 
@@ -338,15 +341,15 @@ async function runSetupWizard(projectDir, projectName) {
     }
   }
 
-  clack.note(
-    'Optional Cloudflare R2 Setup:\nHave your Account ID, API token (Access + Secret), bucket name, and public bucket URL handy if you want media storage ready now.',
-  );
-  const setupR2 = await clack.confirm({
-    message: 'Do you want to set up Cloudflare R2 for media storage now? (Optional > populate .env keys)',
-  });
-  if (clack.isCancel(setupR2)) {
-    handleWizardCancel('Setup cancelled.');
-  }
+  clack.note(
+    'Optional Cloudflare R2 Setup:\nHave your Account ID, API token (Access + Secret), bucket name, and public bucket URL handy if you want media storage ready now.',
+  );
+  const setupR2 = await clack.confirm({
+    message: 'Do you want to set up Cloudflare R2 for media storage now? (Optional > populate .env keys)',
+  });
+  if (clack.isCancel(setupR2)) {
+    handleWizardCancel('Setup cancelled.');
+  }
 
   let r2Values = {
     publicBaseUrl: '',
@@ -360,34 +363,34 @@ async function runSetupWizard(projectDir, projectName) {
     clack.note('I will open your browser to the R2 dashboard.\nYou need to create a bucket and an R2 API Token.');
     await open('https://dash.cloudflare.com/?to=/:account/r2', { wait: false });
 
-    const r2Keys = await clack.group(
-      {
-        accountId: () =>
-          clack.text({
-            message: 'R2: Paste your Cloudflare Account ID (Overview > Account Details - Bottom right):',
-            validate: (val) => (!val ? 'Account ID is required' : undefined),
-          }),
-        bucketName: () =>
+    const r2Keys = await clack.group(
+      {
+        accountId: () =>
+          clack.text({
+            message: 'R2: Paste your Cloudflare Account ID (Overview > Account Details - Bottom right):',
+            validate: (val) => (!val ? 'Account ID is required' : undefined),
+          }),
+        bucketName: () =>
           clack.text({
             message: 'R2: Paste your Bucket Name:',
             validate: (val) => (!val ? 'Bucket name is required' : undefined),
           }),
-        accessKey: () =>
-          clack.password({
-            message: 'R2: Paste your Access Key ID (create API tokens):',
-            validate: (val) => (!val ? 'Access Key ID is required' : undefined),
-          }),
+        accessKey: () =>
+          clack.password({
+            message: 'R2: Paste your Access Key ID (create API tokens):',
+            validate: (val) => (!val ? 'Access Key ID is required' : undefined),
+          }),
         secretKey: () =>
           clack.password({
             message: 'R2: Paste your Secret Access Key:',
             validate: (val) => (!val ? 'Secret Access Key is required' : undefined),
           }),
-        publicBaseUrl: () =>
-          clack.text({
-            message:
-              'R2: Public Base URL (Bucket > Settings > Public Development URL-Enable: e.g., https://pub-xxx.r2.dev)',
-            validate: (val) => (!val ? 'Public base URL is required' : undefined),
-          }),
+        publicBaseUrl: () =>
+          clack.text({
+            message:
+              'R2: Public Base URL (Bucket > Settings > Public Development URL-Enable: e.g., https://pub-xxx.r2.dev)',
+            validate: (val) => (!val ? 'Public base URL is required' : undefined),
+          }),
       },
       { onCancel: () => handleWizardCancel('Setup cancelled.') },
     );
@@ -417,10 +420,10 @@ async function runSetupWizard(projectDir, projectName) {
     clack.note('Cloudflare R2 placeholders added to .env. Configure them later when ready.');
   }
 
-  clack.note(
-    'Optional SMTP Setup:\nProvide the host, port, credentials, and from details for your email provider (e.g., Resend, Postmark) to send transactional emails immediately.',
-  );
-  const setupSMTP = await clack.confirm({
+  clack.note(
+    'Optional SMTP Setup:\nProvide the host, port, credentials, and from details for your email provider (e.g., Resend, Postmark) to send transactional emails immediately.',
+  );
+  const setupSMTP = await clack.confirm({
     message: 'Do you want to set up an SMTP server for emails now? (Optional)',
   });
   if (clack.isCancel(setupSMTP)) {

package/package.json

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

package/templates/nextblock-template/README.md

@@ -1,8 +1,9 @@
-# Next.js 15 & Supabase - Ultra-Fast CMS Template
+# Next.js 16 & Supabase - Ultra-Fast CMS Template
 
-This project is a starter template for building an ultra-fast, localized, block-based Content Management System (CMS) using Next.js 15 (App Router), Supabase for the backend (PostgreSQL, Auth, Storage via R2), Tailwind CSS for styling, and shadcn/ui for components.
+This project is a starter template for building an ultra-fast, localized, block-based Content Management System (CMS) using Next.js 16 (App Router), Supabase for the backend (PostgreSQL, Auth, Storage via R2), Tailwind CSS for styling, and shadcn/ui for components.
 
 It features:
+
 - Role-Based Access Control (Admin, Writer, User)
 - Internationalization (i18n) with client-side language switching on single URLs
 - Block-based content editor for Pages and Posts
@@ -12,156 +13,84 @@ It features:
 
 ## Features Implemented (Phases 1-6)
 
-* **Authentication & Authorization (Phase 1):** User roles (ADMIN, WRITER, USER), profiles table linked to `auth.users`, Row Level Security (RLS) on tables, Next.js middleware for route protection, and client-side auth context.
-* **Internationalization (Phase 2):** `languages` table in Supabase, client-side language switching using `LanguageContext` without URL path changes (e.g., `/about-us` serves content based on selected language), and auto-creation of localized placeholder content.
-* **CMS Schema & Core CRUD (Phase 3):** Database tables for `pages`, `posts`, `media`, `blocks`, `navigation_items`. CRUD UIs and server actions for managing Pages, Posts, Navigation Items, Users (role changes), and Languages.
-* **Block-Based Content Builder (Phase 4):** Dynamic block system for Pages (and Posts), UI for adding, editing (basic forms), deleting, and drag-and-drop reordering of content blocks.
-* **Rich Text & Media (Phase 5):** Tiptap rich text editor integrated into "Text" blocks, image insertion from Media Library into Tiptap, and media uploads to Cloudflare R2 with a Media Library UI (upload, view, delete, edit metadata).
-* **SSG & Revalidation (Phase 6):** Static generation of public pages/posts (default language), client-side content fetching for language changes, `generateStaticParams`, `generateMetadata`, and on-demand revalidation via Supabase Database Webhooks calling a Next.js API route.
+- **Authentication & Authorization (Phase 1):** User roles (ADMIN, WRITER, USER), profiles table linked to `auth.users`, Row Level Security (RLS) on tables, Next.js middleware for route protection, and client-side auth context.
+- **Internationalization (Phase 2):** `languages` table in Supabase, client-side language switching using `LanguageContext` without URL path changes (e.g., `/about-us` serves content based on selected language), and auto-creation of localized placeholder content.
+- **CMS Schema & Core CRUD (Phase 3):** Database tables for `pages`, `posts`, `media`, `blocks`, `navigation_items`. CRUD UIs and server actions for managing Pages, Posts, Navigation Items, Users (role changes), and Languages.
+- **Block-Based Content Builder (Phase 4):** Dynamic block system for Pages (and Posts), UI for adding, editing (basic forms), deleting, and drag-and-drop reordering of content blocks.
+- **Rich Text & Media (Phase 5):** Tiptap rich text editor integrated into "Text" blocks, image insertion from Media Library into Tiptap, and media uploads to Cloudflare R2 with a Media Library UI (upload, view, delete, edit metadata).
+- **SSG & Revalidation (Phase 6):** Static generation of public pages/posts (default language), client-side content fetching for language changes, `generateStaticParams`, `generateMetadata`, and on-demand revalidation via Supabase Database Webhooks calling a Next.js API route.
+
+## 🚀 Getting Started
+
+The fastest way to start a new project is with our interactive setup wizard.
+
+```bash
+npm create nextblock@latest
+```
+
+This command will:
 
-## Clone and Run Locally
+1.  Scaffold a new NextBlock project.
+2.  Guide you through Supabase and Cloudflare R2 configuration.
+3.  Set up your local environment variables automatically.
 
-1.  **Create a Supabase Project:**
-    * Go to the [Supabase dashboard](https://database.new) and create a new project.
+### Manual Setup
+
+If you are contributing to the core repo or prefer manual setup:
+
+1.  **Clone the repo:**
 
-2.  **Clone This Repository:**
     ```bash
-    git clone <your-repository-url> your-cms-app
-    cd your-cms-app
+    git clone https://github.com/Webman-Dev/nextblock-monorepo.git
+    cd nextblock-monorepo
     ```
 
-3.  **Install Dependencies:**
+2.  **Install dependencies:**
+
     ```bash
     npm install
-    # or
-    yarn install
-    # or
-    pnpm install
     ```
 
-4.  **Set Up Environment Variables:**
-    * Rename `.env.example` to `.env.local`.
-    * Update the following variables in `.env.local` with your Supabase project details and other configurations:
-
-        ```env
-        # Supabase Project Connection (from your Supabase project's API settings)
-        NEXT_PUBLIC_SUPABASE_URL=[https://your-project-ref.supabase.co](https://your-project-ref.supabase.co)
-        NEXT_PUBLIC_SUPABASE_ANON_KEY=your-public-anon-key
-        SUPABASE_SERVICE_ROLE_KEY=your-service-role-key # Found in API settings, needed for admin actions like deleting users
-        SUPABASE_PROJECT_ID=your-supabase-project-id # Used by the Supabase CLI (e.g., in supabase/config.toml)
-
-        # Cloudflare R2 Storage (from your Cloudflare R2 bucket settings & API token)
-        NEXT_PUBLIC_R2_BASE_URL=[https://your-r2-public-url.r2.dev/your-bucket-name](https://your-r2-public-url.r2.dev/your-bucket-name) # Or your custom domain for R2
-        R2_ACCOUNT_ID=your_cloudflare_account_id
-        R2_ACCESS_KEY_ID=your_r2_access_key_id
-        R2_SECRET_ACCESS_KEY=your_r2_secret_access_key
-        R2_BUCKET_NAME=your_r2_bucket_name
-        R2_S3_ENDPOINT=https://<R2_ACCOUNT_ID>.r2.cloudflarestorage.com # e.g., [https://abcdef12345.r2.cloudflarestorage.com](https://abcdef12345.r2.cloudflarestorage.com)
-        R2_REGION=auto # Typically 'auto' for R2
-
-        # Next.js Site Configuration
-        NEXT_PUBLIC_SITE_URL=http://localhost:3000 # For local dev; update for production (e.g., [https://www.yourdomain.com](https://www.yourdomain.com))
-        REVALIDATE_SECRET_TOKEN=generate_a_strong_random_string_here # Used to secure the on-demand revalidation API endpoint
-        ```
-    * `NEXT_PUBLIC_SUPABASE_URL` and `NEXT_PUBLIC_SUPABASE_ANON_KEY` can be found in your Supabase project's API settings.
-    * `SUPABASE_SERVICE_ROLE_KEY` is also in API settings (typically hidden by default, click "Reveal").
-    * Generate a strong, unique string for `REVALIDATE_SECRET_TOKEN`.
-
-5.  **Apply Supabase Migrations:**
-    * Ensure you have the Supabase CLI installed and are logged in (`supabase login`).
-    * Link your local project to your Supabase project:
-        ```bash
-        supabase link --project-ref your-project-ref
-        ```
-    * Apply all database migrations:
-        ```bash
-        supabase db push
-        ```
-        Alternatively, if you prefer to run migrations individually (e.g., for a fresh setup or to ensure order):
-        ```bash
-        supabase migration up
-        ```
-    * This will create all necessary tables (`profiles`, `languages`, `pages`, `posts`, `media`, `blocks`, `navigation_items`), roles, RLS policies, and helper functions.
-
-6.  **Configure Supabase Database Webhooks for On-Demand Revalidation:**
-    Since this project avoids using Supabase Edge Functions (and their Docker dependency) for revalidation, you need to manually set up Database Webhooks to call your Next.js API endpoint directly.
-
-    * Go to your Supabase Project Dashboard -> Database -> Webhooks.
-    * Click "Create a new webhook".
-
-    * **For the `pages` Table:**
-        * **Name:** `Next.js Revalidate Pages` (or similar)
-        * **Table:** Select `pages` (from the `public` schema).
-        * **Events:** Check `INSERT`, `UPDATE`, `DELETE`.
-        * **Webhook Type:** `HTTP Request`
-        * **HTTP URL:** Your Next.js application's revalidation API endpoint.
-            * For local development (if using a tunneling service like ngrok to expose localhost): `http://your-ngrok-url.ngrok.io/api/revalidate`
-            * For production (e.g., Vercel): `https://your-app-name.vercel.app/api/revalidate`
-        * **HTTP Method:** `POST`
-        * **HTTP Headers:**
-            * Click "Add header".
-                * Header name: `x-revalidate-secret`
-                * Header value: The same `REVALIDATE_SECRET_TOKEN` you set in your `.env.local`.
-            * Click "Add header" again.
-                * Header name: `Content-Type`
-                * Header value: `application/json`
-        * Click "Create webhook".
-
-    * **For the `posts` Table:**
-        * Create another webhook with similar settings:
-            * **Name:** `Next.js Revalidate Posts`
-            * **Table:** `posts`
-            * **Events:** `INSERT`, `UPDATE`, `DELETE`.
-            * **HTTP URL:** Same as above.
-            * **HTTP Method:** `POST`
-            * **HTTP Headers:**
-                * `x-revalidate-secret`: Your `REVALIDATE_SECRET_TOKEN`
-                * `Content-Type`: `application/json`
-            * Click "Create webhook".
-
-7.  **Run the Next.js Development Server:**
+3.  **Setup Environment:**
+    Copy `.env.exemple` to `apps/nextblock/.env.local` and fill in your Supabase/R2 credentials.
+
+4.  **Run the Dev Server:**
+
     ```bash
-    npm run dev
-    # or
-    yarn dev
-    # or
-    pnpm dev
+    nx serve nextblock
     ```
-    The application should now be running on [http://localhost:3000](http://localhost:3000/).
 
-8.  **Initial Admin User Setup:**
-    * Sign up for a new user account through the application's sign-up page.
-    * After signing up and verifying the email, you'll need to manually update this user's role to `ADMIN` in the Supabase `profiles` table. You can do this via the Supabase Studio (Table Editor -> `profiles` table).
-        * Find your user's row (by their ID, which matches `auth.users.id`).
-        * Change the `role` column value from `USER` to `ADMIN`.
+5.  **Initial Admin User Setup:**
+    - Sign up for a new user account through the application's sign-up page.
+    - After signing up and verifying the email, you'll need to manually update this user's role to `ADMIN` in the Supabase `profiles` table.
 
-9.  **Shadcn/UI Styling (Optional):**
-    * This template comes with the default shadcn/ui style initialized. If you want to customize the theme or use a different base color, you can delete `components.json` and re-initialize shadcn/ui following their [official documentation](https://ui.shadcn.com/docs/installation/next).
+6.  **Shadcn/UI Styling (Optional):**
+    - This template comes with the default shadcn/ui style initialized. If you want to customize the theme or use a different base color, you can delete `components.json` and re-initialize shadcn/ui following their [official documentation](https://ui.shadcn.com/docs/installation/next).
 
 ## Project Structure Highlights
 
-* `app/`: Next.js App Router.
-    * `app/(auth-pages)/`: Routes for sign-in, sign-up, etc.
-    * `app/cms/`: CMS admin panel routes and layouts.
-        * `app/cms/[entity]/`: CRUD pages for different content types (pages, posts, media, users, navigation, languages).
-        * `app/cms/blocks/`: Components and actions related to the block editor.
-    * `app/[slug]/`: Dynamic route for public "Pages".
-    * `app/article/[slug]/`: Dynamic route for public "Articles".
-    * `app/api/`: API routes (e.g., for revalidation, R2 pre-signed URLs).
-* `components/`: Shared UI components (shadcn/ui based).
-    * `components/ui/`: shadcn/ui components.
-* `context/`: React Context providers (e.g., `AuthContext`, `LanguageContext`).
-* `lib/`: Utility functions and configurations.
-    * `lib/cloudflare/`: Client for Cloudflare R2.
-* `utils/supabase/`: Supabase client setup, types, and middleware helpers.
-* `supabase/migrations/`: SQL database migrations.
+- `app/`: Next.js App Router.
+  - `app/(auth-pages)/`: Routes for sign-in, sign-up, etc.
+  - `app/cms/`: CMS admin panel routes and layouts.
+    - `app/cms/[entity]/`: CRUD pages for different content types (pages, posts, media, users, navigation, languages).
+    - `app/cms/blocks/`: Components and actions related to the block editor.
+  - `app/[slug]/`: Dynamic route for public "Pages".
+  - `app/article/[slug]/`: Dynamic route for public "Articles".
+  - `app/api/`: API routes (e.g., for revalidation, R2 pre-signed URLs).
+- `components/`: Shared UI components (shadcn/ui based).
+  - `components/ui/`: shadcn/ui components.
+- `context/`: React Context providers (e.g., `AuthContext`, `LanguageContext`).
+- `lib/`: Utility functions and configurations.
+  - `lib/cloudflare/`: Client for Cloudflare R2.
+- `utils/supabase/`: Supabase client setup, types, and middleware helpers.
+- `supabase/migrations/`: SQL database migrations.
 
 ## Documentation
 
 For a deeper understanding of the CMS's internal workings, please refer to the detailed documentation:
 
-*   **[CMS Application Overview](./docs/cms-application-overview.md):** A high-level guide to the Next.js application structure, core modules, and key functionalities.
-*   **[Block Editor Architecture](./docs/cms-architecture-overview.md):** A technical deep-dive into the architecture of the block-based content editor.
+- **[CMS Application Overview](./docs/cms-application-overview.md):** A high-level guide to the Next.js application structure, core modules, and key functionalities.
+- **[Block Editor Architecture](./docs/cms-architecture-overview.md):** A technical deep-dive into the architecture of the block-based content editor.
 
 ## Deployment
 
@@ -170,7 +99,7 @@ This project is optimized for deployment on [Vercel](https://vercel.com/).
 1.  Push your code to a GitHub/GitLab/Bitbucket repository.
 2.  Import the project into Vercel.
 3.  **Configure Environment Variables in Vercel:**
-    * Add all the environment variables from your `.env.local` file to your Vercel project settings (Project Settings -> Environment Variables). This includes Supabase keys, R2 keys, `NEXT_PUBLIC_SITE_URL` (set to your production domain), and `REVALIDATE_SECRET_TOKEN`.
+    - Add all the environment variables from your `.env.local` file to your Vercel project settings (Project Settings -> Environment Variables). This includes Supabase keys, R2 keys, `NEXT_PUBLIC_SITE_URL` (set to your production domain), and `REVALIDATE_SECRET_TOKEN`.
 4.  Vercel will automatically build and deploy your Next.js application.
 5.  Ensure your Supabase Database Webhooks are pointing to your production Next.js API endpoint for revalidation.
 
@@ -179,7 +108,8 @@ This project is optimized for deployment on [Vercel](https://vercel.com/).
 This project includes a simple script to backup your Supabase PostgreSQL database.
 
 **Requirements:**
-*   You must have the PostgreSQL command-line tools (`pg_dump`) installed and available in your system's PATH.
+
+- You must have the PostgreSQL command-line tools (`pg_dump`) installed and available in your system's PATH.
 
 **Usage:**
 To create a backup, run the following command from your project root:
@@ -189,6 +119,7 @@ npm run db:backup
 ```
 
 This command will generate a timestamped SQL dump file and save it to the `backup/` directory.
+
 ## Feedback and Issues
 
 Please file feedback and issues on the GitHub repository for this project.

package/templates/nextblock-template/app/layout.tsx

@@ -1,6 +1,6 @@
-import '@nextblock-cms/ui/styles/globals.css';
-import '@nextblock-cms/editor/styles/editor.css';
-// app/layout.tsx
+import '@nextblock-cms/ui/styles/globals.css';
+import '@nextblock-cms/editor/styles/editor.css';
+// app/layout.tsx
 import { EnvVarWarning } from "@/components/env-var-warning";
 import { ThemeSwitcher } from '@/components/theme-switcher';
 import type { Metadata } from 'next';
@@ -13,8 +13,8 @@ import { getActiveLanguagesServerSide } from '@nextblock-cms/db/server';
 import { getNavigationMenu } from '@/app/cms/navigation/actions';
 import { getActiveLogo } from '@/app/cms/settings/logos/actions';
 import { getCopyrightSettings } from '@/app/cms/settings/copyright/actions';
-import { getTranslations } from '@/app/cms/settings/extra-translations/actions';
-import type { Database } from '@nextblock-cms/db';
+import { getTranslations } from '@/app/cms/settings/extra-translations/actions';
+import type { Database } from '@nextblock-cms/db';
 import { headers, cookies } from 'next/headers';
 
 const defaultUrl = process.env.VERCEL_URL
@@ -49,7 +49,7 @@ async function loadLayoutData() {
   ] = await Promise.all([
     supabase.auth.getUser(),
     getActiveLanguagesServerSide().catch(() => []),
-    getCopyrightSettings().catch(() => ({ en: '© {year} Nextblock CMS. All rights reserved.' })),
+    getCopyrightSettings().catch(() => ({ en: '© {year} Nextblock CMS. All rights reserved.' })),
     getTranslations().catch(() => []),
   ]);
 
@@ -65,8 +65,8 @@ async function loadLayoutData() {
   }
 
   const copyrightSettings = copyrightSettingsResult as Record<string, string>;
-  const fallbackTemplate =
-    copyrightSettings['en'] ?? '© {year} Nextblock CMS. All rights reserved.';
+  const fallbackTemplate =
+    copyrightSettings['en'] ?? '© {year} Nextblock CMS. All rights reserved.';
   const templateForLocale =
     copyrightSettings[serverDeterminedLocale] ?? fallbackTemplate;
   const copyrightText = templateForLocale.replace('{year}', new Date().getFullYear().toString());
@@ -78,11 +78,11 @@ async function loadLayoutData() {
 
   const headerNavItems: NavigationItem[] = await getNavigationMenu('HEADER', serverDeterminedLocale).catch(() => []);
   const footerNavItems: NavigationItem[] = await getNavigationMenu('FOOTER', serverDeterminedLocale).catch(() => []);
-  const logo = await getActiveLogo().catch(() => null);
+  const logo = await getActiveLogo().catch(() => null);
 
   const role = profile?.role ?? null;
   const canAccessCms = role === 'ADMIN' || role === 'WRITER';
-  const siteTitle = logo?.site_title ?? 'Nextblock';
+  const siteTitle = logo?.site_title ?? 'Nextblock';
 
   return {
     user,
@@ -102,11 +102,22 @@ async function loadLayoutData() {
   };
 }
 
-export const metadata: Metadata = {
-  metadataBase: new URL(defaultUrl),
-  title: 'Nextblock CMS',
-  description: 'Nextblock CMS pairs a visual block editor with a blazing-fast Next.js + Supabase architecture.',
-};
+export const metadata: Metadata = {
+  metadataBase: new URL(defaultUrl),
+  title: 'Nextblock CMS',
+  description: 'Nextblock CMS pairs a visual block editor with a blazing-fast Next.js + Supabase architecture.',
+  icons: {
+    icon: [
+      { url: '/favicon/favicon.ico' },
+      { url: '/favicon/favicon-16x16.png', sizes: '16x16', type: 'image/png' },
+      { url: '/favicon/favicon-32x32.png', sizes: '32x32', type: 'image/png' },
+    ],
+    apple: [
+      { url: '/favicon/apple-touch-icon.png' },
+    ],
+  },
+  manifest: '/favicon/site.webmanifest',
+};
 
 export default async function RootLayout({
   children,

package/templates/nextblock-template/eslint.config.mjs

@@ -1,5 +1,4 @@
 import nx from '@nx/eslint-plugin';
-import baseConfig from '../../eslint.config.mjs';
 import nextPlugin from '@next/eslint-plugin-next';
 
 const nextRules = {
@@ -8,7 +7,6 @@ const nextRules = {
 };
 
 const config = [
-  ...baseConfig,
   ...nx.configs['flat/react-typescript'],
   {
     ignores: ['.next/**/*', '**/next-env.d.ts', 'apps/nextblock/next-env.d.ts'],

package/templates/nextblock-template/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/templates/nextblock-template/package.json

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

package/templates/nextblock-template/public/favicon/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}