create-nextblock 0.14.4 → 0.14.5

package/templates/nextblock-template/lib/cms-transfer/server.ts

@@ -22,10 +22,12 @@ import {
 import {
   createPageRevision,
   createPostRevision,
+  createProductRevision,
 } from "../../app/cms/revisions/service";
 import {
   getFullPageContent,
   getFullPostContent,
+  getFullProductContent,
   type FullPageContent,
   type FullPostContent,
 } from "../../app/cms/revisions/utils";
@@ -1385,6 +1387,12 @@ async function applyProductImport(params: {
       throw new Error(`Failed to save product draft from row ${item.rowNumber}: ${error.message}`);
     }
   } else {
+    // Live mode writes the product row and its blocks directly, so it has to record a
+    // revision itself — exactly as applyContentImport does for pages and posts. Without
+    // this the content changes underneath the revision chain, and the next diff taken
+    // against it would replay onto a document that no longer matches.
+    const previousContent = await getFullProductContent(productId);
+
     const { error } = await auth.supabase
       .from("products")
       .update(toLiveProductPayload(item.meta) as any)
@@ -1407,6 +1415,11 @@ async function applyProductImport(params: {
       await syncCategoriesForTranslationGroup(auth.supabase as any, productId, item.categoryIds);
     }
     await (auth.supabase as any).from("product_drafts").delete().eq("product_id", productId);
+
+    const nextContent = await getFullProductContent(productId);
+    if (previousContent && nextContent) {
+      await createProductRevision(productId, auth.userId, previousContent, nextContent);
+    }
   }
 
   revalidatePath("/cms/products");

package/templates/nextblock-template/lib/full-backup/server.ts

@@ -638,6 +638,7 @@ async function rewriteMediaBaseUrls(params: {
     { table: "products", idColumn: "id", columns: ["description_json", "metadata"] },
     { table: "page_revisions", idColumn: "id", columns: ["content"] },
     { table: "post_revisions", idColumn: "id", columns: ["content"] },
+    { table: "product_revisions", idColumn: "id", columns: ["content"] },
     { table: "site_settings", idColumn: "key", columns: ["value"] },
     { table: "translations", idColumn: "key", columns: ["translations"] },
   ];

package/templates/nextblock-template/lib/publishing/viewUrl.ts

@@ -0,0 +1,26 @@
+/**
+ * Build a link to the `/api/view` entry point used by the CMS "Preview" and
+ * "View Live" buttons.
+ *
+ * Always pass the content's own language. The public site resolves language from
+ * a cookie, not the URL, so a link without `lang` renders in whatever language
+ * the editor happens to be browsing in — which is how opening a French page
+ * landed you on the English one. See `app/api/view/route.ts`.
+ */
+export function buildViewUrl(options: {
+  /** Root-relative public path, e.g. "/about" or "/article/hello". */
+  path: string;
+  /** The content row's language code, e.g. "fr". */
+  languageCode?: string | null;
+  /** True to enter Live Draft Mode (preview unpublished content). */
+  draft?: boolean;
+}): string {
+  const params = new URLSearchParams({ path: options.path });
+  if (options.languageCode) {
+    params.set("lang", options.languageCode);
+  }
+  if (options.draft) {
+    params.set("draft", "1");
+  }
+  return `/api/view?${params.toString()}`;
+}

package/templates/nextblock-template/lib/search/server.ts

@@ -1,6 +1,7 @@
 import 'server-only';
 
 import { getSsgSupabaseClient, verifyPackageOnline } from '@nextblock-cms/db/server';
+import { buildPublishedAtOrFilter } from '@nextblock-cms/utils';
 import { resolveMediaUrl } from '../media/resolveMediaUrl';
 import { getHomepageTranslationGroupId } from '../../app/lib/homepage';
 import type {
@@ -348,6 +349,7 @@ async function fetchPages(languageId: number | null): Promise<SearchCandidate[]>
     `
     )
     .eq('status', 'published')
+    .or(buildPublishedAtOrFilter())
     .order('updated_at', { ascending: false })
     .limit(CANDIDATE_LIMIT);
 
@@ -487,6 +489,7 @@ async function fetchProducts(languageId: number | null): Promise<SearchCandidate
     `
     )
     .eq('status', 'active')
+    .or(buildPublishedAtOrFilter())
     .order('updated_at', { ascending: false })
     .limit(CANDIDATE_LIMIT);
 

package/templates/nextblock-template/lib/setup/migrations-bundle.ts

@@ -88,5 +88,15 @@ export const MIGRATIONS_BUNDLE: BundledMigration[] = [
     "version": "00000000000014",
     "name": "00000000000014_site_themes.sql",
     "sql": "-- Editable site themes.\n--\n-- Themes used to be hardcoded CSS classes in libs/ui/src/styles/theme.css\n-- (:root / .dark / .vibrant) with the switcher list duplicated in\n-- apps/nextblock/app/providers.tsx and components/theme-switcher.tsx. This moves\n-- the palette into the database so an ADMIN can retint the site, add themes and\n-- remove them from /cms/settings/global-css without a redeploy.\n--\n-- Rendering: apps/nextblock/lib/themes/buildThemeCss.ts turns each row into a\n-- `:root.<slug> { --token: value; ... }` rule injected into <head> by\n-- app/layout.tsx. The `:root.x` form is two-class specificity, so generated\n-- themes always beat the (0,1,0) fallback rules still shipped in theme.css for\n-- consumers of the published @nextblock-cms/ui package.\n--\n-- Forward-only and idempotent.\n\nCREATE TABLE IF NOT EXISTS public.site_themes (\n    id uuid DEFAULT gen_random_uuid() NOT NULL,\n    slug text NOT NULL,\n    name text NOT NULL,\n    description text,\n    -- lucide-react icon name rendered by the theme switcher.\n    icon text NOT NULL DEFAULT 'Palette',\n    -- Drives the CSS `color-scheme` property and decides whether the theme also\n    -- carries Tailwind's `.dark` class so `dark:` variants resolve correctly.\n    color_scheme text NOT NULL DEFAULT 'light',\n    -- Flat map of design token -> raw CSS value, keys WITHOUT the leading `--`,\n    -- e.g. {\"background\": \"0 0% 100%\", \"radius\": \"0.75rem\"}.\n    tokens jsonb NOT NULL DEFAULT '{}'::jsonb,\n    -- Optional per-theme CSS, emitted nested inside the theme rule so it is\n    -- automatically scoped. Authors use the `&` nesting selector,\n    -- e.g. `& h1 { text-shadow: 0 0 5px hsl(var(--primary)); }`.\n    extra_css text,\n    -- System themes cannot be deleted: next-themes' `enableSystem` resolves to\n    -- 'light' or 'dark', so those two slugs must always exist.\n    is_system boolean DEFAULT false NOT NULL,\n    is_default boolean DEFAULT false NOT NULL,\n    is_active boolean DEFAULT true NOT NULL,\n    sort_order integer DEFAULT 0 NOT NULL,\n    created_at timestamp with time zone DEFAULT now() NOT NULL,\n    updated_at timestamp with time zone DEFAULT now() NOT NULL,\n    CONSTRAINT site_themes_pkey PRIMARY KEY (id),\n    CONSTRAINT site_themes_slug_key UNIQUE (slug),\n    CONSTRAINT site_themes_color_scheme_check CHECK ((color_scheme = ANY (ARRAY['light'::text, 'dark'::text]))),\n    -- The slug becomes a CSS class and a next-themes value; keep it safe for both.\n    CONSTRAINT site_themes_slug_format_check CHECK ((slug ~ '^[a-z][a-z0-9-]{0,38}[a-z0-9]$')),\n    CONSTRAINT site_themes_tokens_is_object_check CHECK ((jsonb_typeof(tokens) = 'object'))\n);\n\nCOMMENT ON TABLE public.site_themes IS 'Editable colour themes. Each row renders to a `:root.<slug>` CSS rule injected by the root layout. Publicly readable (anonymous visitors need the palette); only ADMIN may write.';\n\nCREATE INDEX IF NOT EXISTS site_themes_active_sort_idx ON public.site_themes USING btree (is_active, sort_order);\n\n-- Exactly one default theme.\nCREATE UNIQUE INDEX IF NOT EXISTS site_themes_single_default_idx ON public.site_themes USING btree (is_default) WHERE (is_default = true);\n\nDROP TRIGGER IF EXISTS set_site_themes_updated_at ON public.site_themes;\nCREATE TRIGGER set_site_themes_updated_at\n    BEFORE UPDATE ON public.site_themes\n    FOR EACH ROW EXECUTE FUNCTION public.set_current_timestamp_updated_at();\n\n-- A system theme must never be deleted, whoever asks.\nCREATE OR REPLACE FUNCTION public.prevent_system_theme_delete() RETURNS trigger\n    LANGUAGE plpgsql\n    SET search_path = ''\n    AS $$\nBEGIN\n  IF OLD.is_system THEN\n    RAISE EXCEPTION 'Theme \"%\" is a system theme and cannot be deleted', OLD.slug\n      USING ERRCODE = 'restrict_violation';\n  END IF;\n  RETURN OLD;\nEND;\n$$;\n\nDROP TRIGGER IF EXISTS trg_prevent_system_theme_delete ON public.site_themes;\nCREATE TRIGGER trg_prevent_system_theme_delete\n    BEFORE DELETE ON public.site_themes\n    FOR EACH ROW EXECUTE FUNCTION public.prevent_system_theme_delete();\n\n-- Promoting a theme to default demotes the previous one, so the unique partial\n-- index above can never trip on a normal \"make this the default\" write.\nCREATE OR REPLACE FUNCTION public.handle_default_theme_change() RETURNS trigger\n    LANGUAGE plpgsql\n    SET search_path = ''\n    AS $$\nBEGIN\n  IF NEW.is_default THEN\n    UPDATE public.site_themes\n       SET is_default = false\n     WHERE id <> NEW.id AND is_default;\n  END IF;\n  RETURN NEW;\nEND;\n$$;\n\nDROP TRIGGER IF EXISTS trg_handle_default_theme_change ON public.site_themes;\nCREATE TRIGGER trg_handle_default_theme_change\n    AFTER INSERT OR UPDATE OF is_default ON public.site_themes\n    FOR EACH ROW WHEN (NEW.is_default) EXECUTE FUNCTION public.handle_default_theme_change();\n\nALTER TABLE public.site_themes ENABLE ROW LEVEL SECURITY;\n\nGRANT ALL ON TABLE public.site_themes TO anon;\nGRANT ALL ON TABLE public.site_themes TO authenticated;\nGRANT ALL ON TABLE public.site_themes TO service_role;\n\nDROP POLICY IF EXISTS \"Public read active themes\" ON public.site_themes;\nCREATE POLICY \"Public read active themes\" ON public.site_themes\n    FOR SELECT TO authenticated, anon USING (true);\n\nDROP POLICY IF EXISTS \"Admins insert themes\" ON public.site_themes;\nCREATE POLICY \"Admins insert themes\" ON public.site_themes\n    FOR INSERT TO authenticated\n    WITH CHECK (((SELECT public.get_current_user_role()) = 'ADMIN'::public.user_role));\n\nDROP POLICY IF EXISTS \"Admins update themes\" ON public.site_themes;\nCREATE POLICY \"Admins update themes\" ON public.site_themes\n    FOR UPDATE TO authenticated\n    USING (((SELECT public.get_current_user_role()) = 'ADMIN'::public.user_role))\n    WITH CHECK (((SELECT public.get_current_user_role()) = 'ADMIN'::public.user_role));\n\nDROP POLICY IF EXISTS \"Admins delete themes\" ON public.site_themes;\nCREATE POLICY \"Admins delete themes\" ON public.site_themes\n    FOR DELETE TO authenticated\n    USING (((SELECT public.get_current_user_role()) = 'ADMIN'::public.user_role));\n\nDROP POLICY IF EXISTS \"Service role manages themes\" ON public.site_themes;\nCREATE POLICY \"Service role manages themes\" ON public.site_themes\n    TO service_role USING (true) WITH CHECK (true);\n\n-- Seed the three shipped themes from libs/ui/src/styles/theme.css.\n-- `--warning` / `--warning-foreground` are declared in the Tailwind theme\n-- (libs/ui/tailwind.config.js) but were never defined in CSS, so bg-warning and\n-- text-warning resolved to an invalid colour. They are given real values here.\nINSERT INTO public.site_themes (slug, name, description, icon, color_scheme, is_system, is_default, sort_order, tokens, extra_css)\nVALUES\n  (\n    'light', 'Light', 'Clean, technical, stark.', 'Sun', 'light', true, true, 10,\n    '{\n      \"background\": \"0 0% 100%\",\n      \"foreground\": \"222 47% 11%\",\n      \"card\": \"0 0% 100%\",\n      \"card-foreground\": \"222 47% 11%\",\n      \"popover\": \"0 0% 100%\",\n      \"popover-foreground\": \"222 47% 11%\",\n      \"primary\": \"211.55 50.26% 37.84%\",\n      \"primary-foreground\": \"210 40% 98%\",\n      \"secondary\": \"210 40% 96.1%\",\n      \"secondary-foreground\": \"222 47% 11%\",\n      \"muted\": \"210 40% 96.1%\",\n      \"muted-foreground\": \"215 16% 47%\",\n      \"accent\": \"210 40% 96.1%\",\n      \"accent-foreground\": \"222 47% 11%\",\n      \"destructive\": \"0 84.2% 60.2%\",\n      \"destructive-foreground\": \"210 40% 98%\",\n      \"warning\": \"38 92% 50%\",\n      \"warning-foreground\": \"222 47% 11%\",\n      \"border\": \"214.3 31.8% 91.4%\",\n      \"input\": \"214.3 31.8% 91.4%\",\n      \"ring\": \"211.55 50.26% 37.84%\",\n      \"radius\": \"0.75rem\",\n      \"chart-1\": \"211.55 50.26% 37.84%\",\n      \"chart-2\": \"215 16% 47%\",\n      \"chart-3\": \"215 25% 27%\",\n      \"chart-4\": \"210 40% 96%\",\n      \"chart-5\": \"214 32% 91%\"\n    }'::jsonb,\n    NULL\n  ),\n  (\n    'dark', 'Dark', 'Midnight / neon tech.', 'Moon', 'dark', true, false, 20,\n    '{\n      \"background\": \"222 47% 2%\",\n      \"foreground\": \"210 40% 98%\",\n      \"card\": \"222 47% 11%\",\n      \"card-foreground\": \"210 40% 98%\",\n      \"popover\": \"222 47% 11%\",\n      \"popover-foreground\": \"210 40% 98%\",\n      \"primary\": \"217 91% 60%\",\n      \"primary-foreground\": \"222 47% 11%\",\n      \"secondary\": \"217.2 32.6% 17.5%\",\n      \"secondary-foreground\": \"210 40% 98%\",\n      \"muted\": \"217.2 32.6% 17.5%\",\n      \"muted-foreground\": \"215 20.2% 65.1%\",\n      \"accent\": \"217.2 32.6% 17.5%\",\n      \"accent-foreground\": \"210 40% 98%\",\n      \"destructive\": \"0 62.8% 30.6%\",\n      \"destructive-foreground\": \"210 40% 98%\",\n      \"warning\": \"38 92% 50%\",\n      \"warning-foreground\": \"222 47% 11%\",\n      \"border\": \"217.2 32.6% 17.5%\",\n      \"input\": \"217.2 32.6% 17.5%\",\n      \"ring\": \"224 76% 48%\",\n      \"radius\": \"0.75rem\",\n      \"chart-1\": \"220 70% 50%\",\n      \"chart-2\": \"160 60% 45%\",\n      \"chart-3\": \"30 80% 55%\",\n      \"chart-4\": \"280 65% 60%\",\n      \"chart-5\": \"340 75% 55%\"\n    }'::jsonb,\n    NULL\n  ),\n  (\n    'vibrant', 'Vibrant', 'Cyberpunk neon.', 'Zap', 'dark', false, false, 30,\n    '{\n      \"background\": \"260 50% 5%\",\n      \"foreground\": \"180 100% 90%\",\n      \"card\": \"260 50% 8%\",\n      \"card-foreground\": \"180 100% 90%\",\n      \"popover\": \"260 50% 8%\",\n      \"popover-foreground\": \"180 100% 90%\",\n      \"primary\": \"320 100% 55%\",\n      \"primary-foreground\": \"0 0% 100%\",\n      \"secondary\": \"180 100% 50%\",\n      \"secondary-foreground\": \"260 50% 5%\",\n      \"muted\": \"260 30% 15%\",\n      \"muted-foreground\": \"260 20% 65%\",\n      \"accent\": \"280 100% 50%\",\n      \"accent-foreground\": \"0 0% 100%\",\n      \"destructive\": \"0 100% 50%\",\n      \"destructive-foreground\": \"0 0% 100%\",\n      \"warning\": \"60 100% 50%\",\n      \"warning-foreground\": \"260 50% 5%\",\n      \"border\": \"320 100% 55%\",\n      \"input\": \"260 30% 15%\",\n      \"ring\": \"320 100% 55%\",\n      \"radius\": \"0px\",\n      \"chart-1\": \"320 100% 55%\",\n      \"chart-2\": \"180 100% 50%\",\n      \"chart-3\": \"280 100% 50%\",\n      \"chart-4\": \"60 100% 50%\",\n      \"chart-5\": \"120 100% 50%\"\n    }'::jsonb,\n    '& h1, & h2, & h3, & h4, & h5, & h6 {\n  text-shadow: 0 0 5px hsl(var(--primary)), 0 0 10px hsl(var(--secondary));\n}\n& button, & [role=\"button\"] {\n  box-shadow: 0 0 5px hsl(var(--primary) / 0.5);\n  transition: box-shadow 0.3s ease;\n}\n& button:hover, & [role=\"button\"]:hover {\n  box-shadow: 0 0 15px hsl(var(--primary));\n}\n& .card, & [class*=\"card\"] {\n  border: 1px solid hsl(var(--primary));\n  box-shadow: 0 0 10px hsl(var(--primary) / 0.2);\n}\n& .border {\n  border-color: hsl(var(--border));\n  box-shadow: 0 0 5px hsl(var(--border) / 0.3);\n}'\n  )\nON CONFLICT (slug) DO NOTHING;\n"
+  },
+  {
+    "version": "00000000000015",
+    "name": "00000000000015_scheduled_publishing.sql",
+    "sql": "-- Scheduled publishing for pages and products.\n--\n-- Posts already support scheduling: `posts.published_at` exists and every public\n-- read gates on `published_at IS NULL OR published_at <= now()`, so a row with\n-- status='published' and a future date is withheld until the date passes. Pages\n-- and products had no equivalent column, so \"go live on Tuesday\" was impossible\n-- for them. This adds the same column with the same semantics.\n--\n-- Visibility is derived from the (status, published_at) PAIR — no new enum value:\n--\n--   status = draft/archived                      -> not public, whatever the date\n--   status = published|active, published_at NULL -> public now\n--   status = published|active, date <= now()     -> public now\n--   status = published|active, date >  now()     -> SCHEDULED (withheld)\n--\n-- Deriving \"scheduled\" instead of storing it keeps `page_status` unchanged (adding\n-- an enum value can't be done inside a transaction with other DDL in Postgres) and\n-- matches what posts have always done, so one code path covers all three types.\n--\n-- NULL is the safe default: every existing published row keeps rendering exactly as\n-- before, so this migration needs no backfill and changes no current behavior.\n--\n-- Forward-only and idempotent.\n\nALTER TABLE public.pages\n    ADD COLUMN IF NOT EXISTS published_at timestamp with time zone;\n\nCOMMENT ON COLUMN public.pages.published_at IS\n    'Optional go-live moment. NULL = live as soon as status is published. A future value withholds the page from public reads until it passes (status stays \"published\"; the CMS renders that pair as \"Scheduled\").';\n\nALTER TABLE public.products\n    ADD COLUMN IF NOT EXISTS published_at timestamp with time zone;\n\nCOMMENT ON COLUMN public.products.published_at IS\n    'Optional go-live moment. NULL = live as soon as status is active. A future value withholds the product from public reads until it passes (status stays \"active\"; the CMS renders that pair as \"Scheduled\").';\n\n-- Public listing/index queries filter on the (status, published_at) pair together\n-- (catalog, sitemap, page lookups), so a composite index serves them in one pass.\nCREATE INDEX IF NOT EXISTS pages_status_published_at_idx\n    ON public.pages (status, published_at);\n\nCREATE INDEX IF NOT EXISTS products_status_published_at_idx\n    ON public.products (status, published_at);\n"
+  },
+  {
+    "version": "00000000000016",
+    "name": "00000000000016_product_revisions_and_revision_baseline.sql",
+    "sql": "-- 00000000000016_product_revisions_and_revision_baseline.sql\n--\n-- Revision History, part 1 of 2 (schema). The application-side rewrite lives in\n-- apps/nextblock/app/cms/revisions/**.\n--\n-- Three things happen here:\n--\n--   1. products.version    — the monotonic counter the hybrid revision engine drives,\n--                            mirroring pages.version / posts.version.\n--\n--   2. product_revisions   — a structural mirror of page_revisions / post_revisions.\n--                            product_id is uuid (products.id is uuid, not bigint), and\n--                            writes are gated on is_admin() to match products_*_policy\n--                            rather than the ADMIN|WRITER pattern the page/post revision\n--                            tables use. A WRITER who could insert a revision but not\n--                            apply a restore would get a silent no-op restore, because\n--                            PostgREST returns no error for an UPDATE matching zero rows.\n--\n--   3. Revision baseline   — every page, post and product gets a real `snapshot` row to\n--                            restore to. Until now the CMS synthesised a fake \"Initial\n--                            Version\" entry in the UI whose Restore button resolved to\n--                            \"current metadata + zero blocks\" and wiped the content.\n--                            There is now an actual stored baseline instead.\n--\n--                            Case A (version = 1, no revisions at all): the live row IS\n--                            version 1. This covers seeded content — 00000000000003\n--                            inserts every page and post at version 1 and writes no\n--                            revision rows — and everything authored since the CMS save\n--                            path stopped recording revisions. Snapshotting it at\n--                            version 1 is what makes \"restore the original seeded page\"\n--                            real for the first time.\n--\n--                            Case B (version > 1 but no snapshot at or below it): the\n--                            true v1 is unrecoverable and is NOT fabricated. A snapshot\n--                            of the current state is stored at the current version so the\n--                            diff chain has a valid base and future restores resolve.\n--\n-- Forward-only, idempotent, and it modifies no existing row: every backfill is an\n-- INSERT ... WHERE NOT EXISTS ... ON CONFLICT DO NOTHING.\n\n-- ---------------------------------------------------------------------------\n-- 1. products.version\n-- ---------------------------------------------------------------------------\n\nALTER TABLE public.products\n    ADD COLUMN IF NOT EXISTS version integer DEFAULT 1 NOT NULL;\n\nCOMMENT ON COLUMN public.products.version IS 'Monotonic version number for hybrid revisions.';\n\n-- ---------------------------------------------------------------------------\n-- 2. product_revisions\n-- ---------------------------------------------------------------------------\n\nCREATE TABLE IF NOT EXISTS public.product_revisions (\n    id bigint NOT NULL,\n    product_id uuid NOT NULL,\n    author_id uuid,\n    version integer NOT NULL,\n    revision_type public.revision_type NOT NULL,\n    content jsonb NOT NULL,\n    created_at timestamp with time zone DEFAULT now() NOT NULL\n);\n\nCOMMENT ON TABLE public.product_revisions IS 'Hybrid (snapshot/diff) revisions for products.';\nCOMMENT ON COLUMN public.product_revisions.content IS 'If snapshot: full content; if diff: JSON Patch array.';\n\nDO $rb$\nBEGIN\n  IF NOT EXISTS (\n    SELECT 1 FROM pg_attribute\n     WHERE attrelid = 'public.product_revisions'::regclass\n       AND attname  = 'id'\n       AND attidentity <> ''\n  ) THEN\n    ALTER TABLE public.product_revisions\n      ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (\n        SEQUENCE NAME public.product_revisions_id_seq\n        START WITH 1\n        INCREMENT BY 1\n        NO MINVALUE\n        NO MAXVALUE\n        CACHE 1\n      );\n  END IF;\nEND $rb$;\n\nDO $rb$\nBEGIN\n  IF NOT EXISTS (SELECT 1 FROM pg_constraint\n                  WHERE conname = 'product_revisions_pkey'\n                    AND conrelid = 'public.product_revisions'::regclass) THEN\n    ALTER TABLE ONLY public.product_revisions\n      ADD CONSTRAINT product_revisions_pkey PRIMARY KEY (id);\n  END IF;\nEND $rb$;\n\nDO $rb$\nBEGIN\n  IF NOT EXISTS (SELECT 1 FROM pg_constraint\n                  WHERE conname = 'product_revisions_product_version_key'\n                    AND conrelid = 'public.product_revisions'::regclass) THEN\n    ALTER TABLE ONLY public.product_revisions\n      ADD CONSTRAINT product_revisions_product_version_key UNIQUE (product_id, version);\n  END IF;\nEND $rb$;\n\nDO $rb$\nBEGIN\n  IF NOT EXISTS (SELECT 1 FROM pg_constraint\n                  WHERE conname = 'product_revisions_author_id_fkey'\n                    AND conrelid = 'public.product_revisions'::regclass) THEN\n    ALTER TABLE ONLY public.product_revisions\n      ADD CONSTRAINT product_revisions_author_id_fkey\n      FOREIGN KEY (author_id) REFERENCES public.profiles(id) ON DELETE SET NULL;\n  END IF;\nEND $rb$;\n\nDO $rb$\nBEGIN\n  IF NOT EXISTS (SELECT 1 FROM pg_constraint\n                  WHERE conname = 'product_revisions_product_id_fkey'\n                    AND conrelid = 'public.product_revisions'::regclass) THEN\n    ALTER TABLE ONLY public.product_revisions\n      ADD CONSTRAINT product_revisions_product_id_fkey\n      FOREIGN KEY (product_id) REFERENCES public.products(id) ON DELETE CASCADE;\n  END IF;\nEND $rb$;\n\nCREATE INDEX IF NOT EXISTS idx_product_revisions_author_id\n    ON public.product_revisions USING btree (author_id);\n\nCREATE INDEX IF NOT EXISTS idx_product_revisions_product_id_version\n    ON public.product_revisions USING btree (product_id, version);\n\nALTER TABLE public.product_revisions ENABLE ROW LEVEL SECURITY;\n\nDROP POLICY IF EXISTS product_revisions_read_policy ON public.product_revisions;\nCREATE POLICY product_revisions_read_policy ON public.product_revisions\n  FOR SELECT TO authenticated USING (true);\n\nDROP POLICY IF EXISTS product_revisions_insert_policy ON public.product_revisions;\nCREATE POLICY product_revisions_insert_policy ON public.product_revisions\n  FOR INSERT TO authenticated\n  WITH CHECK (((SELECT public.is_admin() AS is_admin) IS TRUE));\n\nDROP POLICY IF EXISTS product_revisions_update_policy ON public.product_revisions;\nCREATE POLICY product_revisions_update_policy ON public.product_revisions\n  FOR UPDATE TO authenticated\n  USING (((SELECT public.is_admin() AS is_admin) IS TRUE))\n  WITH CHECK (((SELECT public.is_admin() AS is_admin) IS TRUE));\n\nDROP POLICY IF EXISTS product_revisions_delete_policy ON public.product_revisions;\nCREATE POLICY product_revisions_delete_policy ON public.product_revisions\n  FOR DELETE TO authenticated\n  USING (((SELECT public.is_admin() AS is_admin) IS TRUE));\n\nGRANT ALL ON TABLE    public.product_revisions        TO anon;\nGRANT ALL ON TABLE    public.product_revisions        TO authenticated;\nGRANT ALL ON TABLE    public.product_revisions        TO service_role;\nGRANT ALL ON SEQUENCE public.product_revisions_id_seq TO anon;\nGRANT ALL ON SEQUENCE public.product_revisions_id_seq TO authenticated;\nGRANT ALL ON SEQUENCE public.product_revisions_id_seq TO service_role;\n\n-- ---------------------------------------------------------------------------\n-- 3. Revision baseline backfill\n--\n-- The JSON shape must match FullPageContent / FullPostContent / FullProductContent\n-- in apps/nextblock/app/cms/revisions/utils.ts exactly, or the first diff taken\n-- against a baseline row will be full of phantom operations.\n--\n-- Timestamps are rendered with an explicit millisecond-precision UTC format so they\n-- match JavaScript's Date#toISOString() (\"2026-07-03T17:52:15.643Z\"). Postgres'\n-- default jsonb rendering of timestamptz (\"2026-07-03T17:52:15.643901+00:00\") would\n-- differ from the value the application writes and produce a spurious diff on the\n-- very next save.\n-- ---------------------------------------------------------------------------\n\n-- 3a. Pages\nINSERT INTO public.page_revisions (page_id, author_id, version, revision_type, content)\nSELECT\n    p.id,\n    NULL::uuid,\n    p.version,\n    'snapshot'::public.revision_type,\n    jsonb_build_object(\n      'meta', jsonb_build_object(\n        'title',            p.title,\n        'slug',             p.slug,\n        'language_id',      p.language_id,\n        'status',           p.status,\n        'meta_title',       p.meta_title,\n        'meta_description', p.meta_description,\n        'custom_canonical', p.custom_canonical,\n        'published_at',     to_char(p.published_at AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'),\n        'feature_image_id', p.feature_image_id\n      ),\n      'blocks', COALESCE((\n        SELECT jsonb_agg(\n                 jsonb_build_object(\n                   'language_id', b.language_id,\n                   'block_type',  b.block_type,\n                   'content',     b.content,\n                   'order',       b.\"order\"\n                 ) ORDER BY b.\"order\" ASC, b.id ASC\n               )\n          FROM public.blocks b\n         WHERE b.page_id = p.id\n      ), '[]'::jsonb)\n    )\n  FROM public.pages p\n WHERE NOT EXISTS (\n         SELECT 1 FROM public.page_revisions r\n          WHERE r.page_id = p.id\n            AND r.revision_type = 'snapshot'\n            AND r.version <= p.version\n       )\nON CONFLICT (page_id, version) DO NOTHING;\n\n-- 3b. Posts\nINSERT INTO public.post_revisions (post_id, author_id, version, revision_type, content)\nSELECT\n    po.id,\n    NULL::uuid,\n    po.version,\n    'snapshot'::public.revision_type,\n    jsonb_build_object(\n      'meta', jsonb_build_object(\n        'title',            po.title,\n        'slug',             po.slug,\n        'language_id',      po.language_id,\n        'status',           po.status,\n        'meta_title',       po.meta_title,\n        'meta_description', po.meta_description,\n        'custom_canonical', po.custom_canonical,\n        'published_at',     to_char(po.published_at AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'),\n        'feature_image_id', po.feature_image_id,\n        'label',            po.label,\n        'excerpt',          po.excerpt,\n        'subtitle',         po.subtitle\n      ),\n      'blocks', COALESCE((\n        SELECT jsonb_agg(\n                 jsonb_build_object(\n                   'language_id', b.language_id,\n                   'block_type',  b.block_type,\n                   'content',     b.content,\n                   'order',       b.\"order\"\n                 ) ORDER BY b.\"order\" ASC, b.id ASC\n               )\n          FROM public.blocks b\n         WHERE b.post_id = po.id\n      ), '[]'::jsonb)\n    )\n  FROM public.posts po\n WHERE NOT EXISTS (\n         SELECT 1 FROM public.post_revisions r\n          WHERE r.post_id = po.id\n            AND r.revision_type = 'snapshot'\n            AND r.version <= po.version\n       )\nON CONFLICT (post_id, version) DO NOTHING;\n\n-- 3c. Products.\n--\n-- Content only. price/prices/sale_*/scheduled_*/stock/sku/average_rating/total_reviews\n-- are deliberately excluded from the snapshot: pricing and inventory are mutated from\n-- outside the editor (promotions, Freemius sync, order fulfilment), ratings are derived\n-- aggregates, and inventory_items is keyed by bare SKU text with no FK to products — so\n-- replaying commerce state on restore would reach rows the editor never touched.\n-- Restoring a product restores its content, not its commerce state.\nINSERT INTO public.product_revisions (product_id, author_id, version, revision_type, content)\nSELECT\n    pr.id,\n    NULL::uuid,\n    pr.version,\n    'snapshot'::public.revision_type,\n    jsonb_build_object(\n      'meta', jsonb_build_object(\n        'title',             pr.title,\n        'slug',              pr.slug,\n        'language_id',       pr.language_id,\n        'status',            pr.status,\n        'meta_title',        pr.meta_title,\n        'meta_description',  pr.meta_description,\n        'custom_canonical',  pr.custom_canonical,\n        'published_at',      to_char(pr.published_at AT TIME ZONE 'UTC', 'YYYY-MM-DD\"T\"HH24:MI:SS.MS\"Z\"'),\n        'short_description', pr.short_description,\n        'description_json',  pr.description_json\n      ),\n      'blocks', COALESCE((\n        SELECT jsonb_agg(\n                 jsonb_build_object(\n                   'language_id', b.language_id,\n                   'block_type',  b.block_type,\n                   'content',     b.content,\n                   'order',       b.\"order\"\n                 ) ORDER BY b.\"order\" ASC, b.id ASC\n               )\n          FROM public.blocks b\n         WHERE b.product_id = pr.id\n      ), '[]'::jsonb)\n    )\n  FROM public.products pr\n WHERE NOT EXISTS (\n         SELECT 1 FROM public.product_revisions r\n          WHERE r.product_id = pr.id\n            AND r.revision_type = 'snapshot'\n            AND r.version <= pr.version\n       )\nON CONFLICT (product_id, version) DO NOTHING;\n"
   }
 ];

package/templates/nextblock-template/lib/visual-editing/mutations.ts

@@ -16,7 +16,10 @@ import type {
 } from "./types";
 
 export type VisualEditingMutationResult =
-  | { success: true }
+  // `warning` marks a partial success: the content is live, but something non-blocking
+  // afterwards failed (today, recording the revision). Callers should surface it without
+  // treating the publish as failed.
+  | { success: true; warning?: string }
   | { error: string };
 
 export function isValidParentType(value: string): value is NextblockVisualDocumentType {

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

@@ -4,6 +4,8 @@ import type { Json } from "@nextblock-cms/db";
 import { createClient, getServiceRoleSupabaseClient } from "@nextblock-cms/db/server";
 import { updateProduct, syncProductSaleCouponToFreemius } from "@nextblock-cms/ecommerce/server";
 import { getCurrentUserCanEdit, normalizeDraftBlocks } from "./draft-content";
+import { getFullProductContent } from "../../app/cms/revisions/utils";
+import { createProductRevision } from "../../app/cms/revisions/service";
 import {
   formatVisualEditingError,
   requireVisualEditingEditableUser,
@@ -377,12 +379,32 @@ export async function publishProductVisualEditingDraft(
     }
 
     const draft = normalizeProductDraftRow(data);
+
+    // Captured before any write, so the revision records the real before/after pair.
+    const previousContent = await getFullProductContent(productId);
+
     const hasFullProductFormValues =
       draft.meta &&
       (typeof draft.meta.sku === "string" || typeof draft.meta.price === "number");
 
     if (hasFullProductFormValues) {
-      await updateProduct(auth.supabase as any, productId, draft.meta as any);
+      // Visibility belongs to the row, not the draft: `upsert_product_with_variants`
+      // takes `status` as a required field, so publishing a draft that still carries
+      // an old status would move the product in or out of the storefront behind the
+      // editor's back. Pin it to whatever is live right now. (`published_at` is not
+      // part of the RPC payload, so the schedule survives untouched.)
+      const { data: liveProduct } = await (auth.supabase as any)
+        .from("products")
+        .select("status")
+        .eq("id", productId)
+        .maybeSingle();
+
+      const metaWithLiveVisibility = {
+        ...(draft.meta as any),
+        status: liveProduct?.status ?? (draft.meta as any)?.status,
+      };
+
+      await updateProduct(auth.supabase as any, productId, metaWithLiveVisibility);
       if ((draft.meta as any)?.payment_provider === "freemius") {
         try {
           await syncProductSaleCouponToFreemius({
@@ -445,6 +467,25 @@ export async function publishProductVisualEditingDraft(
       }
     }
 
+    // The product row and its blocks are already live at this point, so a failed revision
+    // is reported as a warning rather than aborting: returning early here would leave the
+    // draft row undeleted and the storefront un-revalidated.
+    let revisionWarning: string | null = null;
+    const nextContent = await getFullProductContent(productId);
+    if (previousContent && nextContent) {
+      const revision = await createProductRevision(
+        productId,
+        auth.user.id,
+        previousContent,
+        nextContent
+      );
+      if ("error" in revision) {
+        revisionWarning = revision.error;
+      }
+    } else {
+      revisionWarning = "the product content could not be read back";
+    }
+
     const { error: deleteError } = await (auth.supabase as any)
       .from("product_drafts")
       .delete()
@@ -460,6 +501,10 @@ export async function publishProductVisualEditingDraft(
     }
     revalidateVisualEditingPath(`/cms/products/${productId}/edit`);
 
+    if (revisionWarning) {
+      return { success: true, warning: `Published, but history was not recorded: ${revisionWarning}` };
+    }
+
     return { success: true };
   } catch (error) {
     return {

package/templates/nextblock-template/package.json

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