create-nextblock 0.16.4 → 0.17.0

package/templates/nextblock-template/lib/visual-editing/draft-content.test.ts

@@ -1,105 +1,105 @@
-import { describe, expect, it, vi } from "vitest";
-
-vi.mock("server-only", () => ({}));
-vi.mock("@nextblock-cms/db/server", () => ({
-  createClient: vi.fn(),
-  getServiceRoleSupabaseClient: vi.fn(),
-  getSsgSupabaseClient: vi.fn(),
-}));
-
-import {
-  findDraftBlock,
-  updateDraftBlockContent,
-} from "./draft-content";
-import type { ContentDraftSnapshot } from "./types";
-
-describe("draft content merge helpers", () => {
-  it("updates top-level draft block content without mutating the original snapshot", () => {
-    const snapshot: ContentDraftSnapshot = {
-      meta: {},
-      blocks: [
-        {
-          id: 10,
-          page_id: 1,
-          post_id: null,
-          language_id: 1,
-          block_type: "text",
-          content: { html_content: "<p>Old</p>" },
-          order: 0,
-        },
-      ],
-    };
-
-    const next = updateDraftBlockContent(
-      snapshot,
-      {
-        parentType: "page",
-        parentId: 1,
-        target: {
-          kind: "top-level",
-          blockId: 10,
-          blockIndex: 0,
-          blockType: "text",
-        },
-      },
-      { html_content: "<p>New</p>" }
-    );
-
-    expect(snapshot.blocks[0].content).toEqual({ html_content: "<p>Old</p>" });
-    expect(next.blocks[0].content).toEqual({ html_content: "<p>New</p>" });
-  });
-
-  it("finds and updates nested draft block content", () => {
-    const snapshot: ContentDraftSnapshot = {
-      meta: {},
-      blocks: [
-        {
-          id: 20,
-          page_id: 1,
-          post_id: null,
-          language_id: 1,
-          block_type: "section",
-          content: {
-            column_blocks: [
-              [
-                {
-                  block_type: "heading",
-                  content: { text_content: "Old heading", level: 2 },
-                },
-              ],
-            ],
-          },
-          order: 0,
-        },
-      ],
-    };
-    const request = {
-      parentType: "page" as const,
-      parentId: 1,
-      target: {
-        kind: "nested" as const,
-        parentBlockId: 20,
-        parentBlockIndex: 0,
-        parentBlockType: "section" as const,
-        columnIndex: 0,
-        blockIndex: 0,
-        blockType: "heading",
-      },
-    };
-
-    expect(findDraftBlock(snapshot, request)).toMatchObject({
-      block_type: "heading",
-      content: { text_content: "Old heading", level: 2 },
-    });
-
-    const next = updateDraftBlockContent(snapshot, request, {
-      text_content: "New heading",
-      level: 2,
-    });
-
-    expect((next.blocks[0].content as any).column_blocks[0][0].content).toEqual({
-      text_content: "New heading",
-      level: 2,
-    });
-  });
-});
+import { describe, expect, it, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+vi.mock("@nextblock-cms/db/server", () => ({
+  createClient: vi.fn(),
+  getServiceRoleSupabaseClient: vi.fn(),
+  getSsgSupabaseClient: vi.fn(),
+}));
+
+import {
+  findDraftBlock,
+  updateDraftBlockContent,
+} from "./draft-content";
+import type { ContentDraftSnapshot } from "./types";
+
+describe("draft content merge helpers", () => {
+  it("updates top-level draft block content without mutating the original snapshot", () => {
+    const snapshot: ContentDraftSnapshot = {
+      meta: {},
+      blocks: [
+        {
+          id: 10,
+          page_id: 1,
+          post_id: null,
+          language_id: 1,
+          block_type: "text",
+          content: { html_content: "<p>Old</p>" },
+          order: 0,
+        },
+      ],
+    };
+
+    const next = updateDraftBlockContent(
+      snapshot,
+      {
+        parentType: "page",
+        parentId: 1,
+        target: {
+          kind: "top-level",
+          blockId: 10,
+          blockIndex: 0,
+          blockType: "text",
+        },
+      },
+      { html_content: "<p>New</p>" }
+    );
+
+    expect(snapshot.blocks[0].content).toEqual({ html_content: "<p>Old</p>" });
+    expect(next.blocks[0].content).toEqual({ html_content: "<p>New</p>" });
+  });
+
+  it("finds and updates nested draft block content", () => {
+    const snapshot: ContentDraftSnapshot = {
+      meta: {},
+      blocks: [
+        {
+          id: 20,
+          page_id: 1,
+          post_id: null,
+          language_id: 1,
+          block_type: "section",
+          content: {
+            column_blocks: [
+              [
+                {
+                  block_type: "heading",
+                  content: { text_content: "Old heading", level: 2 },
+                },
+              ],
+            ],
+          },
+          order: 0,
+        },
+      ],
+    };
+    const request = {
+      parentType: "page" as const,
+      parentId: 1,
+      target: {
+        kind: "nested" as const,
+        parentBlockId: 20,
+        parentBlockIndex: 0,
+        parentBlockType: "section" as const,
+        columnIndex: 0,
+        blockIndex: 0,
+        blockType: "heading",
+      },
+    };
+
+    expect(findDraftBlock(snapshot, request)).toMatchObject({
+      block_type: "heading",
+      content: { text_content: "Old heading", level: 2 },
+    });
+
+    const next = updateDraftBlockContent(snapshot, request, {
+      text_content: "New heading",
+      level: 2,
+    });
+
+    expect((next.blocks[0].content as any).column_blocks[0][0].content).toEqual({
+      text_content: "New heading",
+      level: 2,
+    });
+  });
+});

package/templates/nextblock-template/lib/visual-editing/draft-route.test.ts

@@ -1,42 +1,42 @@
-import { describe, expect, it } from "vitest";
-import {
-  normalizeDraftRedirectPath,
-  resolveDraftPathTarget,
-} from "./draft-route";
-
-describe("draft-route helpers", () => {
-  it("normalizes relative draft redirect paths", () => {
-    expect(normalizeDraftRedirectPath("about")).toBe("/about");
-    expect(normalizeDraftRedirectPath("/article/post-one")).toBe("/article/post-one");
-    expect(normalizeDraftRedirectPath("/product/sku-one")).toBe("/product/sku-one");
-    expect(normalizeDraftRedirectPath("//evil.example/path")).toBeNull();
-    expect(normalizeDraftRedirectPath("https://evil.example/path")).toBeNull();
-    expect(normalizeDraftRedirectPath("/admin\\settings")).toBeNull();
-  });
-
-  it("resolves page and post targets without allowing nested open-ended paths", () => {
-    expect(resolveDraftPathTarget("/")).toEqual({
-      parentType: "page",
-      slug: "home",
-      path: "/",
-    });
-    expect(resolveDraftPathTarget("/about")).toEqual({
-      parentType: "page",
-      slug: "about",
-      path: "/about",
-    });
-    expect(resolveDraftPathTarget("/article/hello-world")).toEqual({
-      parentType: "post",
-      slug: "hello-world",
-      path: "/article/hello-world",
-    });
-    expect(resolveDraftPathTarget("/product/commerce-license")).toEqual({
-      parentType: "product",
-      slug: "commerce-license",
-      path: "/product/commerce-license",
-    });
-    expect(resolveDraftPathTarget("/nested/page")).toBeNull();
-    expect(resolveDraftPathTarget("/article/nested/post")).toBeNull();
-    expect(resolveDraftPathTarget("/product/nested/product")).toBeNull();
-  });
-});
+import { describe, expect, it } from "vitest";
+import {
+  normalizeDraftRedirectPath,
+  resolveDraftPathTarget,
+} from "./draft-route";
+
+describe("draft-route helpers", () => {
+  it("normalizes relative draft redirect paths", () => {
+    expect(normalizeDraftRedirectPath("about")).toBe("/about");
+    expect(normalizeDraftRedirectPath("/article/post-one")).toBe("/article/post-one");
+    expect(normalizeDraftRedirectPath("/product/sku-one")).toBe("/product/sku-one");
+    expect(normalizeDraftRedirectPath("//evil.example/path")).toBeNull();
+    expect(normalizeDraftRedirectPath("https://evil.example/path")).toBeNull();
+    expect(normalizeDraftRedirectPath("/admin\\settings")).toBeNull();
+  });
+
+  it("resolves page and post targets without allowing nested open-ended paths", () => {
+    expect(resolveDraftPathTarget("/")).toEqual({
+      parentType: "page",
+      slug: "home",
+      path: "/",
+    });
+    expect(resolveDraftPathTarget("/about")).toEqual({
+      parentType: "page",
+      slug: "about",
+      path: "/about",
+    });
+    expect(resolveDraftPathTarget("/article/hello-world")).toEqual({
+      parentType: "post",
+      slug: "hello-world",
+      path: "/article/hello-world",
+    });
+    expect(resolveDraftPathTarget("/product/commerce-license")).toEqual({
+      parentType: "product",
+      slug: "commerce-license",
+      path: "/product/commerce-license",
+    });
+    expect(resolveDraftPathTarget("/nested/page")).toBeNull();
+    expect(resolveDraftPathTarget("/article/nested/post")).toBeNull();
+    expect(resolveDraftPathTarget("/product/nested/product")).toBeNull();
+  });
+});

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

@@ -1,143 +1,143 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-
-vi.mock("server-only", () => ({}));
-
-import { buildVisualEditAttributes } from "./edit-info";
-
-describe("buildVisualEditAttributes", () => {
-  beforeEach(() => {
-    delete process.env.NEXTBLOCK_VERCEL_PROJECT_ID;
-    delete process.env.NEXTBLOCK_VERCEL_WORKSPACE_ID;
-    delete process.env.NEXT_PUBLIC_URL;
-    delete process.env.TARGET_URL;
-  });
-
-  it("returns no attributes when visual editing is disabled", () => {
-    expect(
-      buildVisualEditAttributes(
-        {
-          enabled: false,
-          documentType: "page",
-          documentId: 12,
-          slug: "about",
-          languageId: 1,
-        },
-        {
-          kind: "top-level",
-          blockId: 99,
-          blockIndex: 0,
-          blockType: "text",
-        }
-      )
-    ).toBeUndefined();
-  });
-
-  it("builds a stringified Vercel edit-info payload with document and block metadata", () => {
-    process.env.NEXTBLOCK_VERCEL_PROJECT_ID = "prj_123";
-    process.env.NEXTBLOCK_VERCEL_WORKSPACE_ID = "team_123";
-
-    const attrs = buildVisualEditAttributes(
-      {
-        enabled: true,
-        documentType: "post",
-        documentId: 42,
-        slug: "hello-world",
-        languageId: 1,
-        draftId: 7,
-      },
-      {
-        kind: "top-level",
-        blockId: 99,
-        blockIndex: 0,
-        blockType: "heading",
-      }
-    );
-
-    expect(attrs).toBeDefined();
-    const payload = JSON.parse(attrs?.["data-vercel-edit-info"] ?? "{}");
-    const target = JSON.parse(attrs?.["data-vercel-edit-target"] ?? "{}");
-
-    expect(payload).toMatchObject({
-      origin: "localhost",
-      projectId: "prj_123",
-      workspaceId: "team_123",
-      editUrl: "http://localhost:3000/cms/posts/42/edit",
-      data: {
-        parentType: "post",
-        parentId: 42,
-        slug: "hello-world",
-        languageId: 1,
-        draftId: 7,
-      },
-    });
-    expect(target).toEqual({
-      kind: "top-level",
-      blockId: 99,
-      blockIndex: 0,
-      blockType: "heading",
-    });
-  });
-
-  it("dynamically overrides origin with NEXT_PUBLIC_URL and TARGET_URL", () => {
-    process.env.NEXT_PUBLIC_URL = "https://custom-domain.com/";
-    const attrs = buildVisualEditAttributes(
-      {
-        enabled: true,
-        documentType: "page",
-        documentId: 10,
-        slug: "home",
-        languageId: 1,
-      },
-      {
-        kind: "top-level",
-        blockId: 1,
-        blockIndex: 0,
-        blockType: "text",
-      }
-    );
-    const payload = JSON.parse(attrs?.["data-vercel-edit-info"] ?? "{}");
-    expect(payload.origin).toBe("custom-domain.com");
-
-    // Test TARGET_URL fallback if NEXT_PUBLIC_URL is empty
-    delete process.env.NEXT_PUBLIC_URL;
-    process.env.TARGET_URL = "https://another-domain.xyz/subpath/";
-    const attrsTarget = buildVisualEditAttributes(
-      {
-        enabled: true,
-        documentType: "page",
-        documentId: 10,
-        slug: "home",
-        languageId: 1,
-      },
-      {
-        kind: "top-level",
-        blockId: 1,
-        blockIndex: 0,
-        blockType: "text",
-      }
-    );
-    const payloadTarget = JSON.parse(attrsTarget?.["data-vercel-edit-info"] ?? "{}");
-    expect(payloadTarget.origin).toBe("another-domain.xyz");
-  });
-
-  it("uses pageOrigin from context if provided", () => {
-    const attrs = buildVisualEditAttributes(
-      {
-        enabled: true,
-        documentType: "page",
-        documentId: 10,
-        slug: "home",
-        languageId: 1,
-        pageOrigin: "https://my-custom-origin.dev/",
-      },
-      {
-        kind: "top-level",
-        blockId: 1,
-        blockIndex: 0,
-        blockType: "text",
-      }
-    );
-    const payload = JSON.parse(attrs?.["data-vercel-edit-info"] ?? "{}");
-    expect(payload.origin).toBe("my-custom-origin.dev");
-  });
-});
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+vi.mock("server-only", () => ({}));
+
+import { buildVisualEditAttributes } from "./edit-info";
+
+describe("buildVisualEditAttributes", () => {
+  beforeEach(() => {
+    delete process.env.NEXTBLOCK_VERCEL_PROJECT_ID;
+    delete process.env.NEXTBLOCK_VERCEL_WORKSPACE_ID;
+    delete process.env.NEXT_PUBLIC_URL;
+    delete process.env.TARGET_URL;
+  });
+
+  it("returns no attributes when visual editing is disabled", () => {
+    expect(
+      buildVisualEditAttributes(
+        {
+          enabled: false,
+          documentType: "page",
+          documentId: 12,
+          slug: "about",
+          languageId: 1,
+        },
+        {
+          kind: "top-level",
+          blockId: 99,
+          blockIndex: 0,
+          blockType: "text",
+        }
+      )
+    ).toBeUndefined();
+  });
+
+  it("builds a stringified Vercel edit-info payload with document and block metadata", () => {
+    process.env.NEXTBLOCK_VERCEL_PROJECT_ID = "prj_123";
+    process.env.NEXTBLOCK_VERCEL_WORKSPACE_ID = "team_123";
+
+    const attrs = buildVisualEditAttributes(
+      {
+        enabled: true,
+        documentType: "post",
+        documentId: 42,
+        slug: "hello-world",
+        languageId: 1,
+        draftId: 7,
+      },
+      {
+        kind: "top-level",
+        blockId: 99,
+        blockIndex: 0,
+        blockType: "heading",
+      }
+    );
+
+    expect(attrs).toBeDefined();
+    const payload = JSON.parse(attrs?.["data-vercel-edit-info"] ?? "{}");
+    const target = JSON.parse(attrs?.["data-vercel-edit-target"] ?? "{}");
+
+    expect(payload).toMatchObject({
+      origin: "localhost",
+      projectId: "prj_123",
+      workspaceId: "team_123",
+      editUrl: "http://localhost:3000/cms/posts/42/edit",
+      data: {
+        parentType: "post",
+        parentId: 42,
+        slug: "hello-world",
+        languageId: 1,
+        draftId: 7,
+      },
+    });
+    expect(target).toEqual({
+      kind: "top-level",
+      blockId: 99,
+      blockIndex: 0,
+      blockType: "heading",
+    });
+  });
+
+  it("dynamically overrides origin with NEXT_PUBLIC_URL and TARGET_URL", () => {
+    process.env.NEXT_PUBLIC_URL = "https://custom-domain.com/";
+    const attrs = buildVisualEditAttributes(
+      {
+        enabled: true,
+        documentType: "page",
+        documentId: 10,
+        slug: "home",
+        languageId: 1,
+      },
+      {
+        kind: "top-level",
+        blockId: 1,
+        blockIndex: 0,
+        blockType: "text",
+      }
+    );
+    const payload = JSON.parse(attrs?.["data-vercel-edit-info"] ?? "{}");
+    expect(payload.origin).toBe("custom-domain.com");
+
+    // Test TARGET_URL fallback if NEXT_PUBLIC_URL is empty
+    delete process.env.NEXT_PUBLIC_URL;
+    process.env.TARGET_URL = "https://another-domain.xyz/subpath/";
+    const attrsTarget = buildVisualEditAttributes(
+      {
+        enabled: true,
+        documentType: "page",
+        documentId: 10,
+        slug: "home",
+        languageId: 1,
+      },
+      {
+        kind: "top-level",
+        blockId: 1,
+        blockIndex: 0,
+        blockType: "text",
+      }
+    );
+    const payloadTarget = JSON.parse(attrsTarget?.["data-vercel-edit-info"] ?? "{}");
+    expect(payloadTarget.origin).toBe("another-domain.xyz");
+  });
+
+  it("uses pageOrigin from context if provided", () => {
+    const attrs = buildVisualEditAttributes(
+      {
+        enabled: true,
+        documentType: "page",
+        documentId: 10,
+        slug: "home",
+        languageId: 1,
+        pageOrigin: "https://my-custom-origin.dev/",
+      },
+      {
+        kind: "top-level",
+        blockId: 1,
+        blockIndex: 0,
+        blockType: "text",
+      }
+    );
+    const payload = JSON.parse(attrs?.["data-vercel-edit-info"] ?? "{}");
+    expect(payload.origin).toBe("my-custom-origin.dev");
+  });
+});