create-nextblock 0.16.1 → 0.16.2

package/templates/nextblock-template/lib/visual-editing/edit-info.ts

@@ -1,94 +1,94 @@
-import "server-only";
-
-import type {
-  NextblockVisualEditInfo,
-  VisualEditAttributes,
-  VisualEditingBlockTarget,
-  VisualEditingDocumentContext,
-} from "./types";
-
-function getEditUrl(
-  documentType: VisualEditingDocumentContext["documentType"],
-  documentId: number | string,
-  baseUrl: string
-) {
-  const path = documentType === "product"
-    ? `/cms/products/${documentId}/edit`
-    : documentType === "page"
-      ? `/cms/pages/${documentId}/edit`
-      : `/cms/posts/${documentId}/edit`;
-  return `${baseUrl}${path}`;
-}
-
-export async function getRequestOrigin(): Promise<string | undefined> {
-  try {
-    const { headers } = require("next/headers");
-    const headersList = await headers();
-    const host = headersList.get("host");
-    const proto = headersList.get("x-forwarded-proto") || "https";
-    if (host) {
-      return `${proto}://${host}`;
-    }
-  } catch {
-    // Fallback for static builds/tests
-  }
-  return undefined;
-}
-
-export function buildVisualEditAttributes(
-  context: VisualEditingDocumentContext | undefined,
-  target: VisualEditingBlockTarget
-): VisualEditAttributes | undefined {
-  if (!context?.enabled) {
-    return undefined;
-  }
-
-  const baseUrl = 
-    process.env.NEXT_PUBLIC_URL || 
-    process.env.TARGET_URL || 
-    (process.env.VERCEL_URL ? `https://${process.env.VERCEL_URL}` : "") || 
-    "http://localhost:3000";
-
-  const pageOrigin = context?.pageOrigin || (process.env.VERCEL_URL
-    ? `https://${process.env.VERCEL_URL}`
-    : (process.env.NEXT_PUBLIC_URL || process.env.TARGET_URL || "http://localhost:3000"));
-
-  let origin = pageOrigin.replace(/\/+$/, "");
-  try {
-    if (origin.startsWith("http://") || origin.startsWith("https://")) {
-      origin = new URL(origin).hostname;
-    }
-  } catch {
-    // Fallback
-  }
-
-  const payload: NextblockVisualEditInfo = {
-    origin,
-    baseUrl: baseUrl,
-    editUrl: getEditUrl(context.documentType, context.documentId, baseUrl),
-    data: {
-      parentType: context.documentType,
-      parentId: context.documentId,
-      slug: context.slug,
-      languageId: context.languageId,
-      draftId: context.draftId ?? null,
-      target,
-    },
-  };
-
-  const projectId = process.env.NEXTBLOCK_VERCEL_PROJECT_ID || process.env.VERCEL_PROJECT_ID;
-  if (projectId) {
-    payload.projectId = projectId;
-  }
-
-  const workspaceId = process.env.NEXTBLOCK_VERCEL_WORKSPACE_ID || process.env.VERCEL_ORG_ID;
-  if (workspaceId) {
-    payload.workspaceId = workspaceId;
-  }
-
-  return {
-    "data-vercel-edit-info": JSON.stringify(payload),
-    "data-vercel-edit-target": JSON.stringify(target),
-    "data-nextblock-visual-edit": `${target.kind}:${target.blockType}`,
-  };
-}
+import "server-only";
+
+import type {
+  NextblockVisualEditInfo,
+  VisualEditAttributes,
+  VisualEditingBlockTarget,
+  VisualEditingDocumentContext,
+} from "./types";
+
+function getEditUrl(
+  documentType: VisualEditingDocumentContext["documentType"],
+  documentId: number | string,
+  baseUrl: string
+) {
+  const path = documentType === "product"
+    ? `/cms/products/${documentId}/edit`
+    : documentType === "page"
+      ? `/cms/pages/${documentId}/edit`
+      : `/cms/posts/${documentId}/edit`;
+  return `${baseUrl}${path}`;
+}
+
+export async function getRequestOrigin(): Promise<string | undefined> {
+  try {
+    const { headers } = require("next/headers");
+    const headersList = await headers();
+    const host = headersList.get("host");
+    const proto = headersList.get("x-forwarded-proto") || "https";
+    if (host) {
+      return `${proto}://${host}`;
+    }
+  } catch {
+    // Fallback for static builds/tests
+  }
+  return undefined;
+}
+
+export function buildVisualEditAttributes(
+  context: VisualEditingDocumentContext | undefined,
+  target: VisualEditingBlockTarget
+): VisualEditAttributes | undefined {
+  if (!context?.enabled) {
+    return undefined;
+  }
+
+  const baseUrl = 
+    process.env.NEXT_PUBLIC_URL || 
+    process.env.TARGET_URL || 
+    (process.env.VERCEL_URL ? `https://${process.env.VERCEL_URL}` : "") || 
+    "http://localhost:3000";
+
+  const pageOrigin = context?.pageOrigin || (process.env.VERCEL_URL
+    ? `https://${process.env.VERCEL_URL}`
+    : (process.env.NEXT_PUBLIC_URL || process.env.TARGET_URL || "http://localhost:3000"));
+
+  let origin = pageOrigin.replace(/\/+$/, "");
+  try {
+    if (origin.startsWith("http://") || origin.startsWith("https://")) {
+      origin = new URL(origin).hostname;
+    }
+  } catch {
+    // Fallback
+  }
+
+  const payload: NextblockVisualEditInfo = {
+    origin,
+    baseUrl: baseUrl,
+    editUrl: getEditUrl(context.documentType, context.documentId, baseUrl),
+    data: {
+      parentType: context.documentType,
+      parentId: context.documentId,
+      slug: context.slug,
+      languageId: context.languageId,
+      draftId: context.draftId ?? null,
+      target,
+    },
+  };
+
+  const projectId = process.env.NEXTBLOCK_VERCEL_PROJECT_ID || process.env.VERCEL_PROJECT_ID;
+  if (projectId) {
+    payload.projectId = projectId;
+  }
+
+  const workspaceId = process.env.NEXTBLOCK_VERCEL_WORKSPACE_ID || process.env.VERCEL_ORG_ID;
+  if (workspaceId) {
+    payload.workspaceId = workspaceId;
+  }
+
+  return {
+    "data-vercel-edit-info": JSON.stringify(payload),
+    "data-vercel-edit-target": JSON.stringify(target),
+    "data-nextblock-visual-edit": `${target.kind}:${target.blockType}`,
+  };
+}

package/templates/nextblock-template/lib/visual-editing/product-drafts.test.ts

@@ -1,81 +1,81 @@
-import { describe, expect, it, vi } from "vitest";
-
-vi.mock("server-only", () => ({}));
-vi.mock("next/cache", () => ({
-  revalidatePath: vi.fn(),
-}));
-vi.mock("@nextblock-cms/db/server", () => ({
-  createClient: vi.fn(),
-  getServiceRoleSupabaseClient: vi.fn(),
-  getSsgSupabaseClient: vi.fn(),
-}));
-
-import {
-  applyProductDraftToProductRecord,
-  assertValidProductFieldRequest,
-} from "./product-drafts";
-import type { VisualEditingProductFieldRequest } from "./types";
-
-const productId = "123e4567-e89b-12d3-a456-426614174000";
-
-describe("product visual editing drafts", () => {
-  it("validates product field draft targets", () => {
-    const request: VisualEditingProductFieldRequest = {
-      parentType: "product",
-      parentId: productId,
-      target: {
-        kind: "product-field",
-        field: "description_json",
-        input: "tiptap",
-        label: "Product description",
-      },
-    };
-
-    expect(() => assertValidProductFieldRequest(request)).not.toThrow();
-  });
-
-  it("rejects product title targets that use the wrong editor input", () => {
-    const request: VisualEditingProductFieldRequest = {
-      parentType: "product",
-      parentId: productId,
-      target: {
-        kind: "product-field",
-        field: "title",
-        input: "tiptap",
-        label: "Product title",
-      },
-    };
-
-    expect(() => assertValidProductFieldRequest(request)).toThrow(
-      "Invalid product field editor."
-    );
-  });
-
-  it("overlays visible storefront product fields from a draft snapshot", () => {
-    const product = {
-      id: productId,
-      title: "Published title",
-      slug: "published-product",
-      short_description: "Published short copy",
-      description_json: { type: "doc", content: [] },
-      price: 100,
-    };
-    const draft = {
-      id: 1,
-      product_id: productId,
-      author_id: "user-1",
-      meta: {
-        title: "Draft title",
-        short_description: "Draft short copy",
-      },
-      created_at: "2026-01-01T00:00:00.000Z",
-      updated_at: "2026-01-01T00:00:00.000Z",
-    };
-
-    expect(applyProductDraftToProductRecord(product, draft)).toMatchObject({
-      title: "Draft title",
-      short_description: "Draft short copy",
-      price: 100,
-    });
-  });
-});
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+vi.mock("next/cache", () => ({
+  revalidatePath: vi.fn(),
+}));
+vi.mock("@nextblock-cms/db/server", () => ({
+  createClient: vi.fn(),
+  getServiceRoleSupabaseClient: vi.fn(),
+  getSsgSupabaseClient: vi.fn(),
+}));
+
+import {
+  applyProductDraftToProductRecord,
+  assertValidProductFieldRequest,
+} from "./product-drafts";
+import type { VisualEditingProductFieldRequest } from "./types";
+
+const productId = "123e4567-e89b-12d3-a456-426614174000";
+
+describe("product visual editing drafts", () => {
+  it("validates product field draft targets", () => {
+    const request: VisualEditingProductFieldRequest = {
+      parentType: "product",
+      parentId: productId,
+      target: {
+        kind: "product-field",
+        field: "description_json",
+        input: "tiptap",
+        label: "Product description",
+      },
+    };
+
+    expect(() => assertValidProductFieldRequest(request)).not.toThrow();
+  });
+
+  it("rejects product title targets that use the wrong editor input", () => {
+    const request: VisualEditingProductFieldRequest = {
+      parentType: "product",
+      parentId: productId,
+      target: {
+        kind: "product-field",
+        field: "title",
+        input: "tiptap",
+        label: "Product title",
+      },
+    };
+
+    expect(() => assertValidProductFieldRequest(request)).toThrow(
+      "Invalid product field editor."
+    );
+  });
+
+  it("overlays visible storefront product fields from a draft snapshot", () => {
+    const product = {
+      id: productId,
+      title: "Published title",
+      slug: "published-product",
+      short_description: "Published short copy",
+      description_json: { type: "doc", content: [] },
+      price: 100,
+    };
+    const draft = {
+      id: 1,
+      product_id: productId,
+      author_id: "user-1",
+      meta: {
+        title: "Draft title",
+        short_description: "Draft short copy",
+      },
+      created_at: "2026-01-01T00:00:00.000Z",
+      updated_at: "2026-01-01T00:00:00.000Z",
+    };
+
+    expect(applyProductDraftToProductRecord(product, draft)).toMatchObject({
+      title: "Draft title",
+      short_description: "Draft short copy",
+      price: 100,
+    });
+  });
+});

package/templates/nextblock-template/lib/zod-config.ts

@@ -1,5 +1,5 @@
-import { z } from 'zod';
-
-z.config({ jitless: true });
-
-export { z };
+import { z } from 'zod';
+
+z.config({ jitless: true });
+
+export { z };

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

@@ -1,7 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
-import "./.next/types/root-params.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.16.1",
+  "version": "0.16.2",
   "description": "The open-source, full-stack AI-native CMS for Next.js 16, Supabase, and Tailwind CSS.",
   "keywords": [
     "cms",

package/templates/nextblock-template/postcss.config.js

@@ -1,6 +1,6 @@
-module.exports = {
-  plugins: {
-    '@tailwindcss/postcss': {},
-    autoprefixer: {},
-  },
-};
+module.exports = {
+  plugins: {
+    '@tailwindcss/postcss': {},
+    autoprefixer: {},
+  },
+};

package/templates/nextblock-template/scripts/backup.js

@@ -1,8 +1,8 @@
 // apps/nextblock/scripts/backup.js
-const fs = require('fs');
-const path = require('path');
-const { spawn } = require('child_process');
-const readline = require('readline');
+const fs = require('fs');
+const path = require('path');
+const { spawn } = require('child_process');
+const readline = require('readline');
 
 // Load environment (database connection string should be in .env.local or .env)
 require('dotenv').config({ path: '.env.local' });  // adjust path if needed
@@ -35,114 +35,114 @@ const port = connectionUrl.port || '5432';
 const dbName = connectionUrl.pathname.replace(/^\//, '');  // strip leading '/'
 const user = connectionUrl.username;
 const password = connectionUrl.password;
-const sslMode = connectionUrl.searchParams.get('sslmode') || 'require';  // default to require SSL
-
-// Prepare backup directory with timestamp name
-const timestamp = new Date().toISOString().replace(/[:.]/g, '-');  // replace colon and dot with hyphen for filename safety
-
-function sanitizeName(rawName) {
-  if (!rawName) {
-    return '';
-  }
-  return rawName
-    .trim()
-    .replace(/[^\w.-]+/g, '-')  // keep letters/numbers/_/./-
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '');
-}
-
-function parseNameFromArgs() {
-  const args = process.argv.slice(2);
-  for (let i = 0; i < args.length; i += 1) {
-    const arg = args[i];
-    if (arg === '--name' || arg === '-n') {
-      return args[i + 1] ?? '';
-    }
-    const match = arg.match(/^--name=(.*)$/);
-    if (match) {
-      return match[1];
-    }
-  }
-  if (typeof process.env.BACKUP_NAME === 'string') {
-    return process.env.BACKUP_NAME;
-  }
-  return null;
-}
-
-function promptForName(defaultLabel) {
-  return new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-    rl.question(
-      `Enter a friendly name for this backup (press Enter to use ${defaultLabel}): `,
-      (answer) => {
-        rl.close();
-        resolve(answer);
-      }
-    );
-  });
-}
-
-function buildFolderName(baseName, rawName) {
-  const sanitized = sanitizeName(rawName);
-  if (!sanitized) {
-    return baseName;
-  }
-  return `${baseName}__${sanitized}`;
-}
-
-async function resolveBackupFolderName(baseName) {
-  const providedName = parseNameFromArgs();
-  if (providedName !== null) {
-    return buildFolderName(baseName, providedName);
-  }
-  if (process.stdin.isTTY && process.stdout.isTTY) {
-    const answer = await promptForName(baseName);
-    return buildFolderName(baseName, answer);
-  }
-  return baseName;
-}
-
-(async () => {
-  let backupFolderName;
-  try {
-    backupFolderName = await resolveBackupFolderName(timestamp);
-  } catch (err) {
-    console.error(`❌ Failed to determine backup name: ${err.message}`);
-    process.exit(1);
-  }
-
-  const backupDir = path.join(__dirname, '../backups', backupFolderName);
-  fs.mkdirSync(backupDir, { recursive: true });
-  const dumpFile = path.join(backupDir, 'dump.sql');
-
-  console.log(`🔄 Backing up database to ${dumpFile} ...`);
-
-  // Spawn the pg_dump process
-  const dumpArgs = [
-    '--clean', '--if-exists', '--quote-all-identifiers',  // include DROP statements:contentReference[oaicite:8]{index=8}
-    '-h', host,
-    '-U', user,
-    '-p', port,
-    '-d', dbName,
-    '-f', dumpFile
-  ];
-  const envVars = { ...process.env, PGPASSWORD: password, PGSSLMODE: sslMode };
-  const pgDump = spawn('pg_dump', dumpArgs, { env: envVars });
-
-  // Forward pg_dump errors to console
-  pgDump.stderr.on('data', (data) => {
-    process.stderr.write(data);
-  });
-
-  // Handle process exit
-  pgDump.on('close', (code) => {
-    if (code === 0) {
-      console.log("✅ Backup completed successfully.");
-    } else {
-      console.error(`❌ pg_dump exited with code ${code}. Check error output above for details.`);
-    }
-  });
-})();
+const sslMode = connectionUrl.searchParams.get('sslmode') || 'require';  // default to require SSL
+
+// Prepare backup directory with timestamp name
+const timestamp = new Date().toISOString().replace(/[:.]/g, '-');  // replace colon and dot with hyphen for filename safety
+
+function sanitizeName(rawName) {
+  if (!rawName) {
+    return '';
+  }
+  return rawName
+    .trim()
+    .replace(/[^\w.-]+/g, '-')  // keep letters/numbers/_/./-
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '');
+}
+
+function parseNameFromArgs() {
+  const args = process.argv.slice(2);
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i];
+    if (arg === '--name' || arg === '-n') {
+      return args[i + 1] ?? '';
+    }
+    const match = arg.match(/^--name=(.*)$/);
+    if (match) {
+      return match[1];
+    }
+  }
+  if (typeof process.env.BACKUP_NAME === 'string') {
+    return process.env.BACKUP_NAME;
+  }
+  return null;
+}
+
+function promptForName(defaultLabel) {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
+    rl.question(
+      `Enter a friendly name for this backup (press Enter to use ${defaultLabel}): `,
+      (answer) => {
+        rl.close();
+        resolve(answer);
+      }
+    );
+  });
+}
+
+function buildFolderName(baseName, rawName) {
+  const sanitized = sanitizeName(rawName);
+  if (!sanitized) {
+    return baseName;
+  }
+  return `${baseName}__${sanitized}`;
+}
+
+async function resolveBackupFolderName(baseName) {
+  const providedName = parseNameFromArgs();
+  if (providedName !== null) {
+    return buildFolderName(baseName, providedName);
+  }
+  if (process.stdin.isTTY && process.stdout.isTTY) {
+    const answer = await promptForName(baseName);
+    return buildFolderName(baseName, answer);
+  }
+  return baseName;
+}
+
+(async () => {
+  let backupFolderName;
+  try {
+    backupFolderName = await resolveBackupFolderName(timestamp);
+  } catch (err) {
+    console.error(`❌ Failed to determine backup name: ${err.message}`);
+    process.exit(1);
+  }
+
+  const backupDir = path.join(__dirname, '../backups', backupFolderName);
+  fs.mkdirSync(backupDir, { recursive: true });
+  const dumpFile = path.join(backupDir, 'dump.sql');
+
+  console.log(`🔄 Backing up database to ${dumpFile} ...`);
+
+  // Spawn the pg_dump process
+  const dumpArgs = [
+    '--clean', '--if-exists', '--quote-all-identifiers',  // include DROP statements:contentReference[oaicite:8]{index=8}
+    '-h', host,
+    '-U', user,
+    '-p', port,
+    '-d', dbName,
+    '-f', dumpFile
+  ];
+  const envVars = { ...process.env, PGPASSWORD: password, PGSSLMODE: sslMode };
+  const pgDump = spawn('pg_dump', dumpArgs, { env: envVars });
+
+  // Forward pg_dump errors to console
+  pgDump.stderr.on('data', (data) => {
+    process.stderr.write(data);
+  });
+
+  // Handle process exit
+  pgDump.on('close', (code) => {
+    if (code === 0) {
+      console.log("✅ Backup completed successfully.");
+    } else {
+      console.error(`❌ pg_dump exited with code ${code}. Check error output above for details.`);
+    }
+  });
+})();