create-nextblock 0.12.8 → 0.12.11

package/templates/nextblock-template/components/submit-button.tsx

@@ -1,23 +1,23 @@
-"use client";
-
-import { Button } from "@nextblock-cms/ui";
-import { type ComponentProps } from "react";
-import { useFormStatus } from "react-dom";
-
-type Props = ComponentProps<typeof Button> & {
-  pendingText?: string;
-};
-
-export function SubmitButton({
-  children,
-  pendingText = "Submitting...",
-  ...props
-}: Props) {
-  const { pending } = useFormStatus();
-
-  return (
-    <Button type="submit" aria-disabled={pending} {...props}>
-      {pending ? pendingText : children}
-    </Button>
-  );
-}
+"use client";
+
+import { Button } from "@nextblock-cms/ui";
+import { type ComponentProps } from "react";
+import { useFormStatus } from "react-dom";
+
+type Props = ComponentProps<typeof Button> & {
+  pendingText?: string;
+};
+
+export function SubmitButton({
+  children,
+  pendingText = "Submitting...",
+  ...props
+}: Props) {
+  const { pending } = useFormStatus();
+
+  return (
+    <Button type="submit" aria-disabled={pending} {...props}>
+      {pending ? pendingText : children}
+    </Button>
+  );
+}

package/templates/nextblock-template/components/theme-switcher.tsx

@@ -1,13 +1,13 @@
 "use client";
 
-import { Button } from "@nextblock-cms/ui";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuTrigger,
-} from "@nextblock-cms/ui";
+import { Button } from "@nextblock-cms/ui";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from "@nextblock-cms/ui";
 import { Laptop, Moon, Sun, Zap } from "lucide-react";
 import { useTheme } from "next-themes";
 import { useEffect, useState } from "react";

package/templates/nextblock-template/components/visual-editing/DeferredVisualEditing.tsx

@@ -1,21 +1,21 @@
-'use client';
-
-import dynamic from 'next/dynamic';
-
-// Defer the visual-editing toolbar (and its heavy editor graph: BlockEditorModal,
-// the per-block editors, and editor.css) out of the public bundle. The layout only
-// renders this in draft/visual-editing mode, but a *static* import would still ship
-// the entire editor graph to every public page. Loading it via next/dynamic with
-// ssr:false keeps it out of the public homepage's render-blocking CSS and JS, and
-// pulls it in client-side only when visual editing is actually active.
-const NextblockVisualEditing = dynamic(
-  () =>
-    import('./NextblockVisualEditing').then(
-      (module) => module.NextblockVisualEditing
-    ),
-  { ssr: false }
-);
-
-export function DeferredVisualEditing() {
-  return <NextblockVisualEditing />;
-}
+'use client';
+
+import dynamic from 'next/dynamic';
+
+// Defer the visual-editing toolbar (and its heavy editor graph: BlockEditorModal,
+// the per-block editors, and editor.css) out of the public bundle. The layout only
+// renders this in draft/visual-editing mode, but a *static* import would still ship
+// the entire editor graph to every public page. Loading it via next/dynamic with
+// ssr:false keeps it out of the public homepage's render-blocking CSS and JS, and
+// pulls it in client-side only when visual editing is actually active.
+const NextblockVisualEditing = dynamic(
+  () =>
+    import('./NextblockVisualEditing').then(
+      (module) => module.NextblockVisualEditing
+    ),
+  { ssr: false }
+);
+
+export function DeferredVisualEditing() {
+  return <NextblockVisualEditing />;
+}

package/templates/nextblock-template/context/AuthContext.tsx

@@ -1,10 +1,10 @@
 // context/AuthContext.tsx
-'use client';
-
-import React, { createContext, useContext, useState, useEffect, useMemo } from 'react';
-import type { ReactNode } from 'react';
-import type { User, SupabaseClient } from '@supabase/supabase-js';
-import type { Database } from '@nextblock-cms/db';
+'use client';
+
+import React, { createContext, useContext, useState, useEffect, useMemo } from 'react';
+import type { ReactNode } from 'react';
+import type { User, SupabaseClient } from '@supabase/supabase-js';
+import type { Database } from '@nextblock-cms/db';
 
 type Profile = Database['public']['Tables']['profiles']['Row'];
 type UserRole = Database['public']['Enums']['user_role'];
@@ -28,17 +28,17 @@ interface AuthContextType {
 
 const AuthContext = createContext<AuthContextType | undefined>(undefined);
 
-export const AuthProvider = ({ children, serverUser, serverProfile }: AuthProviderProps) => {
-  const [user, setUser] = useState<User | null>(serverUser);
-  const [profile, setProfile] = useState<Profile | null>(serverProfile);
-  const [role, setRole] = useState<UserRole | null>(serverProfile?.role ?? null);
-  const [isLoading] = useState(false);
-
-  useEffect(() => {
-    setUser(serverUser);
-    setProfile(serverProfile);
-    setRole(serverProfile?.role ?? null);
-  }, [serverUser, serverProfile]);
+export const AuthProvider = ({ children, serverUser, serverProfile }: AuthProviderProps) => {
+  const [user, setUser] = useState<User | null>(serverUser);
+  const [profile, setProfile] = useState<Profile | null>(serverProfile);
+  const [role, setRole] = useState<UserRole | null>(serverProfile?.role ?? null);
+  const [isLoading] = useState(false);
+
+  useEffect(() => {
+    setUser(serverUser);
+    setProfile(serverProfile);
+    setRole(serverProfile?.role ?? null);
+  }, [serverUser, serverProfile]);
 
   const isAdmin = role === 'ADMIN';
   const isWriter = role === 'WRITER';
@@ -49,11 +49,11 @@ export const AuthProvider = ({ children, serverUser, serverProfile }: AuthProvid
     profile,
     role,
     isLoading,
-    isAdmin,
-    isWriter,
-    isUserRole,
-    supabase: null,
-  }), [user, profile, role, isLoading, isAdmin, isWriter, isUserRole]);
+    isAdmin,
+    isWriter,
+    isUserRole,
+    supabase: null,
+  }), [user, profile, role, isLoading, isAdmin, isWriter, isUserRole]);
 
   return (
     <AuthContext.Provider value={value}>
@@ -68,4 +68,4 @@ export const useAuth = () => {
     throw new Error('useAuth must be used within an AuthProvider');
   }
   return context;
-};
+};

package/templates/nextblock-template/context/LanguageContext.tsx

@@ -1,16 +1,16 @@
 // context/LanguageContext.tsx
 'use client'; // This directive applies to the rest of the file.
 
-import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
-import type { ReactNode } from 'react';
-import type { Database } from '@nextblock-cms/db';
+import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
+import type { ReactNode } from 'react';
+import type { Database } from '@nextblock-cms/db';
 
 type Language = Database['public']['Tables']['languages']['Row'];
 import Cookies from 'js-cookie';
 
-const LANGUAGE_STORAGE_KEY = 'preferred_locale_storage';
-const LANGUAGE_COOKIE_KEY = 'NEXT_USER_LOCALE';
-const DEFAULT_FALLBACK_LOCALE = 'en'; // Your ultimate fallback
+const LANGUAGE_STORAGE_KEY = 'preferred_locale_storage';
+const LANGUAGE_COOKIE_KEY = 'NEXT_USER_LOCALE';
+const DEFAULT_FALLBACK_LOCALE = 'en'; // Your ultimate fallback
 
 interface LanguageContextType {
   currentLocale: string;
@@ -64,16 +64,16 @@ export const LanguageProvider = ({
     let isMounted = true; // Track mount status
 
     const initializeLanguages = async () => {
-      let languagesToUse = initialAvailableLanguages;
-      let defaultLangToUse = initialDefaultLanguage;
-
-      // If server didn't provide languages, or they were empty, fetch client-side as a fallback.
-      if (!languagesToUse || languagesToUse.length === 0) {
-        setIsLoadingLanguages(true); // Set loading true only when we need the client fallback.
-        try {
-          const { fetchActiveLanguagesFromRest } = await import('./language-rest-client');
-          const fetchedLangs = await fetchActiveLanguagesFromRest();
-          if (isMounted) { // Check mount status before setting state
+      let languagesToUse = initialAvailableLanguages;
+      let defaultLangToUse = initialDefaultLanguage;
+
+      // If server didn't provide languages, or they were empty, fetch client-side as a fallback.
+      if (!languagesToUse || languagesToUse.length === 0) {
+        setIsLoadingLanguages(true); // Set loading true only when we need the client fallback.
+        try {
+          const { fetchActiveLanguagesFromRest } = await import('./language-rest-client');
+          const fetchedLangs = await fetchActiveLanguagesFromRest();
+          if (isMounted) { // Check mount status before setting state
             languagesToUse = fetchedLangs;
             setAvailableLanguages(fetchedLangs);
             defaultLangToUse = fetchedLangs.find(lang => lang.is_default) || fetchedLangs[0] || null;

package/templates/nextblock-template/context/language-rest-client.ts

@@ -1,32 +1,32 @@
-import type { Database } from '@nextblock-cms/db';
-import { resolveSupabaseAnonKey, resolveSupabaseUrl } from '../lib/setup/env-status';
-
-type Language = Database['public']['Tables']['languages']['Row'];
-
-export async function fetchActiveLanguagesFromRest(): Promise<Language[]> {
-  const supabaseUrl = resolveSupabaseUrl();
-  const supabaseAnonKey = resolveSupabaseAnonKey();
-
-  if (!supabaseUrl || !supabaseAnonKey) {
-    return [];
-  }
-
-  const url = new URL('/rest/v1/languages', supabaseUrl);
-  url.searchParams.set('select', 'id, code, name, is_default, is_active, created_at, updated_at');
-  url.searchParams.set('is_active', 'eq.true');
-  url.searchParams.set('order', 'name.asc');
-
-  const response = await fetch(url.toString(), {
-    headers: {
-      apikey: supabaseAnonKey,
-      Authorization: `Bearer ${supabaseAnonKey}`,
-    },
-  });
-
-  if (!response.ok) {
-    return [];
-  }
-
-  const data = await response.json();
-  return Array.isArray(data) ? data : [];
-}
+import type { Database } from '@nextblock-cms/db';
+import { resolveSupabaseAnonKey, resolveSupabaseUrl } from '../lib/setup/env-status';
+
+type Language = Database['public']['Tables']['languages']['Row'];
+
+export async function fetchActiveLanguagesFromRest(): Promise<Language[]> {
+  const supabaseUrl = resolveSupabaseUrl();
+  const supabaseAnonKey = resolveSupabaseAnonKey();
+
+  if (!supabaseUrl || !supabaseAnonKey) {
+    return [];
+  }
+
+  const url = new URL('/rest/v1/languages', supabaseUrl);
+  url.searchParams.set('select', 'id, code, name, is_default, is_active, created_at, updated_at');
+  url.searchParams.set('is_active', 'eq.true');
+  url.searchParams.set('order', 'name.asc');
+
+  const response = await fetch(url.toString(), {
+    headers: {
+      apikey: supabaseAnonKey,
+      Authorization: `Bearer ${supabaseAnonKey}`,
+    },
+  });
+
+  if (!response.ok) {
+    return [];
+  }
+
+  const data = await response.json();
+  return Array.isArray(data) ? data : [];
+}

package/templates/nextblock-template/docker/db/init/99-jwt.sql

@@ -1,6 +1,6 @@
--- Expose the JWT secret to Postgres as a database GUC, matching Supabase's setup. Runs once.
-\set jwt_secret `echo "$JWT_SECRET"`
-\set jwt_exp `echo "$JWT_EXP"`
-
-alter database postgres set "app.settings.jwt_secret" to :'jwt_secret';
-alter database postgres set "app.settings.jwt_exp" to :'jwt_exp';
+-- Expose the JWT secret to Postgres as a database GUC, matching Supabase's setup. Runs once.
+\set jwt_secret `echo "$JWT_SECRET"`
+\set jwt_exp `echo "$JWT_EXP"`
+
+alter database postgres set "app.settings.jwt_secret" to :'jwt_secret';
+alter database postgres set "app.settings.jwt_exp" to :'jwt_exp';

package/templates/nextblock-template/docker/db/init/99-roles.sql

@@ -1,25 +1,25 @@
--- Self-hosted Supabase role passwords. The supabase/postgres image creates the platform roles;
--- GoTrue logs in as supabase_auth_admin and PostgREST as authenticator. Give the roles that exist
--- the generated POSTGRES_PASSWORD (the set varies by image tag, so each is guarded; the password
--- is passed via a session GUC because psql variables aren't interpolated inside a dollar block).
--- Runs once on first init.
-\set pgpass `echo "$POSTGRES_PASSWORD"`
-select set_config('nextblock.pgpass', :'pgpass', false);
-
-do $$
-declare
-  role_name text;
-begin
-  foreach role_name in array array[
-    'authenticator',
-    'pgbouncer',
-    'supabase_auth_admin',
-    'supabase_storage_admin',
-    'supabase_functions_admin',
-    'supabase_read_only_user'
-  ] loop
-    if exists (select 1 from pg_roles where rolname = role_name) then
-      execute format('alter role %I with password %L', role_name, current_setting('nextblock.pgpass'));
-    end if;
-  end loop;
-end $$;
+-- Self-hosted Supabase role passwords. The supabase/postgres image creates the platform roles;
+-- GoTrue logs in as supabase_auth_admin and PostgREST as authenticator. Give the roles that exist
+-- the generated POSTGRES_PASSWORD (the set varies by image tag, so each is guarded; the password
+-- is passed via a session GUC because psql variables aren't interpolated inside a dollar block).
+-- Runs once on first init.
+\set pgpass `echo "$POSTGRES_PASSWORD"`
+select set_config('nextblock.pgpass', :'pgpass', false);
+
+do $$
+declare
+  role_name text;
+begin
+  foreach role_name in array array[
+    'authenticator',
+    'pgbouncer',
+    'supabase_auth_admin',
+    'supabase_storage_admin',
+    'supabase_functions_admin',
+    'supabase_read_only_user'
+  ] loop
+    if exists (select 1 from pg_roles where rolname = role_name) then
+      execute format('alter role %I with password %L', role_name, current_setting('nextblock.pgpass'));
+    end if;
+  end loop;
+end $$;

package/templates/nextblock-template/docker/kong/kong.yml

@@ -1,112 +1,112 @@
-# Kong declarative (DB-less) gateway config for the NextBlock self-hosted stack.
-#
-# $SUPABASE_ANON_KEY and $SUPABASE_SERVICE_KEY are substituted at container start by the kong
-# service entrypoint (docker-compose.yml) from the generated ANON_KEY / SERVICE_ROLE_KEY env.
-# Trimmed to just the Auth (GoTrue) and PostgREST routes the app uses.
-_format_version: '2.1'
-_transform: true
-
-consumers:
-  - username: anon
-    keyauth_credentials:
-      - key: $SUPABASE_ANON_KEY
-  - username: service_role
-    keyauth_credentials:
-      - key: $SUPABASE_SERVICE_KEY
-
-acls:
-  - consumer: anon
-    group: anon
-  - consumer: service_role
-    group: admin
-
-services:
-  - name: auth-v1-open
-    url: http://auth:9999/verify
-    routes:
-      - name: auth-v1-open
-        strip_path: true
-        paths:
-          - /auth/v1/verify
-    plugins:
-      - name: cors
-  - name: auth-v1-open-callback
-    url: http://auth:9999/callback
-    routes:
-      - name: auth-v1-open-callback
-        strip_path: true
-        paths:
-          - /auth/v1/callback
-    plugins:
-      - name: cors
-  - name: auth-v1-open-authorize
-    url: http://auth:9999/authorize
-    routes:
-      - name: auth-v1-open-authorize
-        strip_path: true
-        paths:
-          - /auth/v1/authorize
-    plugins:
-      - name: cors
-
-  - name: auth-v1
-    url: http://auth:9999/
-    routes:
-      - name: auth-v1-all
-        strip_path: true
-        paths:
-          - /auth/v1/
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: false
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
-
-  - name: rest-v1
-    url: http://rest:3000/
-    routes:
-      - name: rest-v1-all
-        strip_path: true
-        paths:
-          - /rest/v1/
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: true
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
-
-  - name: graphql-v1
-    url: http://rest:3000/rpc/graphql
-    routes:
-      - name: graphql-v1-all
-        strip_path: true
-        paths:
-          - /graphql/v1
-    plugins:
-      - name: cors
-      - name: key-auth
-        config:
-          hide_credentials: false
-      - name: request-transformer
-        config:
-          add:
-            headers:
-              - 'Content-Profile: graphql_public'
-      - name: acl
-        config:
-          hide_groups_header: true
-          allow:
-            - admin
-            - anon
+# Kong declarative (DB-less) gateway config for the NextBlock self-hosted stack.
+#
+# $SUPABASE_ANON_KEY and $SUPABASE_SERVICE_KEY are substituted at container start by the kong
+# service entrypoint (docker-compose.yml) from the generated ANON_KEY / SERVICE_ROLE_KEY env.
+# Trimmed to just the Auth (GoTrue) and PostgREST routes the app uses.
+_format_version: '2.1'
+_transform: true
+
+consumers:
+  - username: anon
+    keyauth_credentials:
+      - key: $SUPABASE_ANON_KEY
+  - username: service_role
+    keyauth_credentials:
+      - key: $SUPABASE_SERVICE_KEY
+
+acls:
+  - consumer: anon
+    group: anon
+  - consumer: service_role
+    group: admin
+
+services:
+  - name: auth-v1-open
+    url: http://auth:9999/verify
+    routes:
+      - name: auth-v1-open
+        strip_path: true
+        paths:
+          - /auth/v1/verify
+    plugins:
+      - name: cors
+  - name: auth-v1-open-callback
+    url: http://auth:9999/callback
+    routes:
+      - name: auth-v1-open-callback
+        strip_path: true
+        paths:
+          - /auth/v1/callback
+    plugins:
+      - name: cors
+  - name: auth-v1-open-authorize
+    url: http://auth:9999/authorize
+    routes:
+      - name: auth-v1-open-authorize
+        strip_path: true
+        paths:
+          - /auth/v1/authorize
+    plugins:
+      - name: cors
+
+  - name: auth-v1
+    url: http://auth:9999/
+    routes:
+      - name: auth-v1-all
+        strip_path: true
+        paths:
+          - /auth/v1/
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+
+  - name: rest-v1
+    url: http://rest:3000/
+    routes:
+      - name: rest-v1-all
+        strip_path: true
+        paths:
+          - /rest/v1/
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: true
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon
+
+  - name: graphql-v1
+    url: http://rest:3000/rpc/graphql
+    routes:
+      - name: graphql-v1-all
+        strip_path: true
+        paths:
+          - /graphql/v1
+    plugins:
+      - name: cors
+      - name: key-auth
+        config:
+          hide_credentials: false
+      - name: request-transformer
+        config:
+          add:
+            headers:
+              - 'Content-Profile: graphql_public'
+      - name: acl
+        config:
+          hide_groups_header: true
+          allow:
+            - admin
+            - anon