create-nextblock 0.14.1 → 0.14.4

package/libs/utils/tsconfig.json

@@ -1,3 +1,3 @@
-{
-  "extends": "../../../../libs/utils/tsconfig.json"
-}
+{
+  "extends": "../../../../libs/utils/tsconfig.json"
+}

package/package.json

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

package/project.json

@@ -1,19 +1,19 @@
-{
-  "name": "create-nextblock",
-  "projectType": "application",
-  "root": "apps/create-nextblock",
-  "sourceRoot": "apps/create-nextblock",
-  "targets": {
-    "lint": {
-      "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "apps/create-nextblock/bin/**/*.js",
-          "apps/create-nextblock/scripts/**/*.js"
-        ]
-      }
-    }
-  },
-  "tags": []
-}
+{
+  "name": "create-nextblock",
+  "projectType": "application",
+  "root": "apps/create-nextblock",
+  "sourceRoot": "apps/create-nextblock",
+  "targets": {
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": [
+          "apps/create-nextblock/bin/**/*.js",
+          "apps/create-nextblock/scripts/**/*.js"
+        ]
+      }
+    }
+  },
+  "tags": []
+}

package/templates/nextblock-template/.browserslistrc

@@ -1,11 +1,11 @@
-chrome >= 109
-edge >= 109
-firefox >= 115
-safari >= 15.4
-ios_saf >= 15.4
-and_chr >= 109
-and_ff >= 115
-samsung >= 21
-opera >= 95
-not dead
-not op_mini all
+chrome >= 109
+edge >= 109
+firefox >= 115
+safari >= 15.4
+ios_saf >= 15.4
+and_chr >= 109
+and_ff >= 115
+samsung >= 21
+opera >= 95
+not dead
+not op_mini all

package/templates/nextblock-template/.dockerignore

@@ -1,23 +1,23 @@
-# Keep the build context lean; deps are reinstalled in the image and secrets stay out.
-node_modules
-.git
-.github
-.next
-out
-dist
-coverage
-tmp
-backup
-backups
-*.log
-npm-debug.log*
-
-# Secrets never enter the image (NEXT_PUBLIC_* arrive as build args).
-.env
-.env.*
-!.env.docker.example
-
-# Not needed inside the app image (mounted/used by other compose services instead).
-docker
-supabase/.branches
-supabase/.temp
+# Keep the build context lean; deps are reinstalled in the image and secrets stay out.
+node_modules
+.git
+.github
+.next
+out
+dist
+coverage
+tmp
+backup
+backups
+*.log
+npm-debug.log*
+
+# Secrets never enter the image (NEXT_PUBLIC_* arrive as build args).
+.env
+.env.*
+!.env.docker.example
+
+# Not needed inside the app image (mounted/used by other compose services instead).
+docker
+supabase/.branches
+supabase/.temp

package/templates/nextblock-template/README.md

@@ -1,34 +1,34 @@
-# apps/nextblock
-
-`apps/nextblock` is the canonical NextBlock™ application. It contains:
-
-- the public site
-- the authenticated CMS
-- checkout and webhook routes
-- cron routes
-- the route tree used as the source for the scaffold template
-
-If you are trying to understand current runtime behavior, start here before you
-look at generated template output.
-
-## Related Docs
-
-- [Project Overview](../../docs/01-PROJECT-OVERVIEW.md)
-- [Ecommerce Capabilities](../../docs/02-ECOMMERCE-CAPABILITIES.md)
-- [CMS and Editor](../../docs/03-CMS-AND-EDITOR.md)
-- [Database and Auth](../../docs/04-DATABASE-AND-AUTH.md)
-- [Developer Guide](../../docs/05-DEVELOPER-GUIDE.md)
-- [CLI and Scaffolding](../../docs/06-CLI-AND-SCAFFOLDING.md)
-
-## Common Workflows
-
-From the repo root:
-
-```bash
-npx nx serve nextblock
-npx nx build nextblock
-npx nx lint nextblock --skip-nx-cache
-```
-
-Use the root docs for architecture and workflow details instead of maintaining a
-second app-specific guide here.
+# apps/nextblock
+
+`apps/nextblock` is the canonical NextBlock™ application. It contains:
+
+- the public site
+- the authenticated CMS
+- checkout and webhook routes
+- cron routes
+- the route tree used as the source for the scaffold template
+
+If you are trying to understand current runtime behavior, start here before you
+look at generated template output.
+
+## Related Docs
+
+- [Project Overview](../../docs/01-PROJECT-OVERVIEW.md)
+- [Ecommerce Capabilities](../../docs/02-ECOMMERCE-CAPABILITIES.md)
+- [CMS and Editor](../../docs/03-CMS-AND-EDITOR.md)
+- [Database and Auth](../../docs/04-DATABASE-AND-AUTH.md)
+- [Developer Guide](../../docs/05-DEVELOPER-GUIDE.md)
+- [CLI and Scaffolding](../../docs/06-CLI-AND-SCAFFOLDING.md)
+
+## Common Workflows
+
+From the repo root:
+
+```bash
+npx nx serve nextblock
+npx nx build nextblock
+npx nx lint nextblock --skip-nx-cache
+```
+
+Use the root docs for architecture and workflow details instead of maintaining a
+second app-specific guide here.

package/templates/nextblock-template/app/(auth-pages)/layout.tsx

@@ -1,9 +1,9 @@
-export default async function Layout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  return (
-    <div className="max-w-7xl mx-auto flex flex-col gap-12 items-start mb-4">{children}</div>
-  );
-}
+export default async function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <div className="max-w-7xl mx-auto flex flex-col gap-12 items-start mb-4">{children}</div>
+  );
+}

package/templates/nextblock-template/app/(auth-pages)/post-sign-in/page.tsx

@@ -1,27 +1,27 @@
-import { createClient } from '@nextblock-cms/db/server';
-import { redirect } from 'next/navigation';
-import { resolvePostAuthRedirect } from '../../../lib/auth-redirects';
-
-export default async function PostSignIn({
-  searchParams,
-}: {
-  searchParams: Promise<{ redirect_to?: string }>;
-}) {
-  const params = await searchParams;
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-
-  if (!user) {
-    redirect('/sign-in');
-  }
-
-  const { data: profile } = await supabase
-    .from('profiles')
-    .select('role, full_name')
-    .eq('id', user.id)
-    .single();
-
-  redirect(resolvePostAuthRedirect(profile ?? null, params.redirect_to));
-}
+import { createClient } from '@nextblock-cms/db/server';
+import { redirect } from 'next/navigation';
+import { resolvePostAuthRedirect } from '../../../lib/auth-redirects';
+
+export default async function PostSignIn({
+  searchParams,
+}: {
+  searchParams: Promise<{ redirect_to?: string }>;
+}) {
+  const params = await searchParams;
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+
+  if (!user) {
+    redirect('/sign-in');
+  }
+
+  const { data: profile } = await supabase
+    .from('profiles')
+    .select('role, full_name')
+    .eq('id', user.id)
+    .single();
+
+  redirect(resolvePostAuthRedirect(profile ?? null, params.redirect_to));
+}

package/templates/nextblock-template/app/(auth-pages)/sign-up/page.tsx

@@ -1,46 +1,46 @@
-import { Suspense } from "react";
-import { headers } from "next/headers";
-import { createClient } from "@nextblock-cms/db/server";
-import SignUpForm from "./SignUpForm";
-
-type BotProtectionProvider = 'none' | 'turnstile' | 'recaptcha';
-
-// Server wrapper: resolves the site-wide bot-protection provider + site key
-// (CMS → Settings → Bot Protection) and the CSP nonce, then hands them to the
-// interactive client form. Mirrors the read in components/BlockRenderer.tsx.
-export default async function SignUpPage() {
-  let scriptNonce = '';
-  try {
-    scriptNonce = (await headers()).get('x-nonce') || '';
-  } catch (e) {
-    console.error('[Bot Protection] Error loading CSP nonce on sign-up page:', e);
-  }
-
-  let botProtection: { provider: BotProtectionProvider; siteKey: string } = {
-    provider: 'none',
-    siteKey: '',
-  };
-  try {
-    const supabase = createClient();
-    const { data: publicSetting } = await supabase
-      .from('site_settings')
-      .select('value')
-      .eq('key', 'bot_protection_public')
-      .maybeSingle();
-    if (publicSetting?.value) {
-      const publicVal = publicSetting.value as Record<string, any>;
-      botProtection = {
-        provider: publicVal.provider || 'none',
-        siteKey: publicVal.siteKey || '',
-      };
-    }
-  } catch (e) {
-    console.error('[Bot Protection] Error loading settings on sign-up page:', e);
-  }
-
-  return (
-    <Suspense fallback={null}>
-      <SignUpForm botProtection={botProtection} scriptNonce={scriptNonce} />
-    </Suspense>
-  );
-}
+import { Suspense } from "react";
+import { headers } from "next/headers";
+import { createClient } from "@nextblock-cms/db/server";
+import SignUpForm from "./SignUpForm";
+
+type BotProtectionProvider = 'none' | 'turnstile' | 'recaptcha';
+
+// Server wrapper: resolves the site-wide bot-protection provider + site key
+// (CMS → Settings → Bot Protection) and the CSP nonce, then hands them to the
+// interactive client form. Mirrors the read in components/BlockRenderer.tsx.
+export default async function SignUpPage() {
+  let scriptNonce = '';
+  try {
+    scriptNonce = (await headers()).get('x-nonce') || '';
+  } catch (e) {
+    console.error('[Bot Protection] Error loading CSP nonce on sign-up page:', e);
+  }
+
+  let botProtection: { provider: BotProtectionProvider; siteKey: string } = {
+    provider: 'none',
+    siteKey: '',
+  };
+  try {
+    const supabase = createClient();
+    const { data: publicSetting } = await supabase
+      .from('site_settings')
+      .select('value')
+      .eq('key', 'bot_protection_public')
+      .maybeSingle();
+    if (publicSetting?.value) {
+      const publicVal = publicSetting.value as Record<string, any>;
+      botProtection = {
+        provider: publicVal.provider || 'none',
+        siteKey: publicVal.siteKey || '',
+      };
+    }
+  } catch (e) {
+    console.error('[Bot Protection] Error loading settings on sign-up page:', e);
+  }
+
+  return (
+    <Suspense fallback={null}>
+      <SignUpForm botProtection={botProtection} scriptNonce={scriptNonce} />
+    </Suspense>
+  );
+}

package/templates/nextblock-template/app/(auth-pages)/two-factor/page.tsx

@@ -1,51 +1,51 @@
-import { redirect } from 'next/navigation';
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  evaluateTwoFactor,
-  hasPendingEmailChallenge,
-} from '../../../lib/auth/twoFactor';
-import TwoFactorForm from './components/TwoFactorForm';
-
-function safeRedirect(path?: string): string {
-  return path && path.startsWith('/') && !path.startsWith('//') ? path : '/cms/dashboard';
-}
-
-export default async function TwoFactorPage({
-  searchParams,
-}: {
-  searchParams: Promise<{ redirect_to?: string }>;
-}) {
-  const params = await searchParams;
-  const redirectTo = safeRedirect(params.redirect_to);
-
-  const evaluation = await evaluateTwoFactor();
-  const userId = evaluation.userId;
-  if (!userId) {
-    redirect('/sign-in');
-  }
-  // Already satisfied (or no MFA) -> straight through.
-  if (evaluation.status === 'satisfied' || evaluation.status === 'not_required') {
-    redirect(redirectTo);
-  }
-
-  const type = evaluation.status === 'totp_required' ? 'totp' : 'email';
-
-  const supabase = createClient();
-  const {
-    data: { user },
-  } = await supabase.auth.getUser();
-
-  const pendingEmailCode =
-    type === 'email' ? await hasPendingEmailChallenge(userId) : false;
-
-  return (
-    <div className="flex-1 flex flex-col w-full max-w-md mx-auto py-10">
-      <TwoFactorForm
-        type={type}
-        email={user?.email ?? ''}
-        redirectTo={redirectTo}
-        pendingEmailCode={pendingEmailCode}
-      />
-    </div>
-  );
-}
+import { redirect } from 'next/navigation';
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  evaluateTwoFactor,
+  hasPendingEmailChallenge,
+} from '../../../lib/auth/twoFactor';
+import TwoFactorForm from './components/TwoFactorForm';
+
+function safeRedirect(path?: string): string {
+  return path && path.startsWith('/') && !path.startsWith('//') ? path : '/cms/dashboard';
+}
+
+export default async function TwoFactorPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ redirect_to?: string }>;
+}) {
+  const params = await searchParams;
+  const redirectTo = safeRedirect(params.redirect_to);
+
+  const evaluation = await evaluateTwoFactor();
+  const userId = evaluation.userId;
+  if (!userId) {
+    redirect('/sign-in');
+  }
+  // Already satisfied (or no MFA) -> straight through.
+  if (evaluation.status === 'satisfied' || evaluation.status === 'not_required') {
+    redirect(redirectTo);
+  }
+
+  const type = evaluation.status === 'totp_required' ? 'totp' : 'email';
+
+  const supabase = createClient();
+  const {
+    data: { user },
+  } = await supabase.auth.getUser();
+
+  const pendingEmailCode =
+    type === 'email' ? await hasPendingEmailChallenge(userId) : false;
+
+  return (
+    <div className="flex-1 flex flex-col w-full max-w-md mx-auto py-10">
+      <TwoFactorForm
+        type={type}
+        email={user?.email ?? ''}
+        redirectTo={redirectTo}
+        pendingEmailCode={pendingEmailCode}
+      />
+    </div>
+  );
+}

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

@@ -1,17 +1,17 @@
-"use client";
-
-import { Toaster } from "react-hot-toast";
-
-export function ToasterProvider() {
-  return (
-    <Toaster
-      position="top-right"
-      toastOptions={{
-        style: { fontSize: 14 },
-        success: { iconTheme: { primary: '#16a34a', secondary: 'white' } },
-        error: { iconTheme: { primary: '#dc2626', secondary: 'white' } },
-      }}
-    />
-  );
-}
-
+"use client";
+
+import { Toaster } from "react-hot-toast";
+
+export function ToasterProvider() {
+  return (
+    <Toaster
+      position="top-right"
+      toastOptions={{
+        style: { fontSize: 14 },
+        success: { iconTheme: { primary: '#16a34a', secondary: 'white' } },
+        error: { iconTheme: { primary: '#dc2626', secondary: 'white' } },
+      }}
+    />
+  );
+}
+

package/templates/nextblock-template/app/[slug]/pageClientActions.ts

@@ -1,7 +1,7 @@
-'use server';
-
-import { getPageDataBySlug } from './page.utils';
-
-export async function getPublishedPageForLocale(slug: string, localeCode: string) {
-  return getPageDataBySlug(slug, localeCode);
-}
+'use server';
+
+import { getPageDataBySlug } from './page.utils';
+
+export async function getPublishedPageForLocale(slug: string, localeCode: string) {
+  return getPageDataBySlug(slug, localeCode);
+}

package/templates/nextblock-template/app/actions/consent.ts

@@ -1,57 +1,57 @@
-'use server';
-
-import { headers } from 'next/headers';
-import { getServiceRoleSupabaseClient } from '@nextblock-cms/db/server';
-
-/** Reduce an IP to a non-identifying form for the consent audit log. */
-function maskIp(ip: string | null): string | null {
-  if (!ip) return null;
-  const first = ip.split(',')[0]?.trim();
-  if (!first) return null;
-  if (first.includes(':')) {
-    // IPv6: keep the first three hextets, drop the rest.
-    const hextets = first.split(':').filter(Boolean);
-    return `${hextets.slice(0, 3).join(':')}::x`;
-  }
-  const octets = first.split('.');
-  if (octets.length === 4) {
-    octets[3] = 'x';
-    return octets.join('.');
-  }
-  return null;
-}
-
-export interface ConsentLogInput {
-  token: string;
-  analytics: boolean;
-  marketing: boolean;
-}
-
-/**
- * Record a consent decision for Law 25 / PIPEDA accountability. Best-effort:
- * failures never block the visitor's choice from taking effect client-side.
- */
-export async function logConsentDecision(input: ConsentLogInput): Promise<{ ok: boolean }> {
-  if (!input?.token) return { ok: false };
-  try {
-    const h = await headers();
-    const ip = h.get('x-forwarded-for') ?? h.get('x-real-ip');
-    const userAgent = h.get('user-agent');
-
-    const supabase = getServiceRoleSupabaseClient();
-    await supabase.from('privacy_consent_logs').insert({
-      consent_token: input.token,
-      categories: {
-        necessary: true,
-        analytics: Boolean(input.analytics),
-        marketing: Boolean(input.marketing),
-      },
-      ip_masked: maskIp(ip),
-      user_agent: userAgent ? userAgent.slice(0, 500) : null,
-    });
-    return { ok: true };
-  } catch (error) {
-    console.error('Failed to record consent decision:', error);
-    return { ok: false };
-  }
-}
+'use server';
+
+import { headers } from 'next/headers';
+import { getServiceRoleSupabaseClient } from '@nextblock-cms/db/server';
+
+/** Reduce an IP to a non-identifying form for the consent audit log. */
+function maskIp(ip: string | null): string | null {
+  if (!ip) return null;
+  const first = ip.split(',')[0]?.trim();
+  if (!first) return null;
+  if (first.includes(':')) {
+    // IPv6: keep the first three hextets, drop the rest.
+    const hextets = first.split(':').filter(Boolean);
+    return `${hextets.slice(0, 3).join(':')}::x`;
+  }
+  const octets = first.split('.');
+  if (octets.length === 4) {
+    octets[3] = 'x';
+    return octets.join('.');
+  }
+  return null;
+}
+
+export interface ConsentLogInput {
+  token: string;
+  analytics: boolean;
+  marketing: boolean;
+}
+
+/**
+ * Record a consent decision for Law 25 / PIPEDA accountability. Best-effort:
+ * failures never block the visitor's choice from taking effect client-side.
+ */
+export async function logConsentDecision(input: ConsentLogInput): Promise<{ ok: boolean }> {
+  if (!input?.token) return { ok: false };
+  try {
+    const h = await headers();
+    const ip = h.get('x-forwarded-for') ?? h.get('x-real-ip');
+    const userAgent = h.get('user-agent');
+
+    const supabase = getServiceRoleSupabaseClient();
+    await supabase.from('privacy_consent_logs').insert({
+      consent_token: input.token,
+      categories: {
+        necessary: true,
+        analytics: Boolean(input.analytics),
+        marketing: Boolean(input.marketing),
+      },
+      ip_masked: maskIp(ip),
+      user_agent: userAgent ? userAgent.slice(0, 500) : null,
+    });
+    return { ok: true };
+  } catch (error) {
+    console.error('Failed to record consent decision:', error);
+    return { ok: false };
+  }
+}