bsmnt 0.7.1 → 0.9.0

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/queries.ts

@@ -54,38 +54,89 @@ const richTextLinkProjection = `
   }
 `;
 
+// `^` is the owning page document, so blocks whose `_key` is in the page's
+// `hiddenPageBuilderKeys` list are filtered out here — a single choke point, so
+// hidden blocks never reach the renderer, the preview, or any derived output
+// built from this projection. `coalesce(..., [])` keeps pages that predate the
+// field (no hidden blocks) rendering normally.
 const pageBuilderProjection = `
-  pageBuilder[]{
+  pageBuilder[!(_key in coalesce(^.hiddenPageBuilderKeys, []))]{
     _key,
     ...@->{
-      ...,
-      _type == "blogContent" => {
-        ...,
-        categories[]->{
-          _id,
-          title,
-          slug
-        },
-        author->{
-          _id,
-          name,
-          avatar,
-          role
-        },
-        body[]{
+      // Gated content withholds its payload from the page query — only the
+      // teaser and gate config ship to the client. GROQ has no field exclusion,
+      // so this branch lists safe fields explicitly rather than spreading every
+      // field. The payload is fetched separately via GATED_CONTENT_QUERY.
+      _type == "gatedContent" => {
+        _id,
+        _type,
+        internalTitle,
+        teaserHeading,
+        teaserBody[]{
           ${richTextLinkProjection}
         },
-        relatedPosts[]->{
-          _id,
-          title,
-          "resolvedSlug": ${pageResolvedSlugExpression},
-          metadata
+        gateType,
+        gateHeadline,
+        gateDescription,
+        submitLabel,
+        successMessage,
+        kind
+      },
+      _type != "gatedContent" => {
+        ...,
+        _type == "blogContent" => {
+          ...,
+          categories[]->{
+            _id,
+            title,
+            slug
+          },
+          author->{
+            _id,
+            name,
+            avatar,
+            role
+          },
+          body[]{
+            ${richTextLinkProjection}
+          },
+          relatedPosts[]->{
+            _id,
+            title,
+            "resolvedSlug": ${pageResolvedSlugExpression},
+            metadata
+          }
         }
       }
     }
   }
 `;
 
+// Gated content payload — fetched on demand by the unlock server action, keyed
+// by the block's document id. Kept out of the page query so it never ships to
+// the client until the visitor completes the gate.
+export const GATED_CONTENT_QUERY = defineQuery(`
+  *[_type == "gatedContent" && _id == $id][0]{
+    kind,
+    content[]{
+      ${richTextLinkProjection}
+    },
+    "file": file.asset->{
+      url,
+      originalFilename,
+      mimeType,
+      size
+    },
+    "video": {
+      "url": videoUrl,
+      "file": videoFile.asset->{
+        url,
+        mimeType
+      }
+    }
+  }
+`);
+
 const pageProjection = `
   _id,
   _type,

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/schemas/components/index.ts

@@ -1,4 +1,5 @@
 export { blogContent } from "./reusable/blog-content";
 export { description } from "./reusable/description";
+export { gatedContent } from "./reusable/gated-content";
 export { hero } from "./reusable/hero";
 export { blogCollection } from "./singleton/content-collection";

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/schemas/components/reusable/gated-content.ts

@@ -0,0 +1,178 @@
+import { defineField, defineType } from "sanity";
+import { gatedContentIcon } from "@/lib/integrations/sanity/icons";
+
+type GatedContentParent = { kind?: string };
+
+const getKindLabel = (kind: unknown) => {
+	if (kind === "file") return "File";
+	if (kind === "video") return "Video";
+	return "Rich Text";
+};
+
+const requiredForKind =
+	(kind: string, message: string) =>
+	(value: unknown, context: { parent?: unknown }) => {
+		const parent = context.parent as GatedContentParent | undefined;
+		if (parent?.kind !== kind) return true;
+		const isEmpty =
+			value == null || (Array.isArray(value) && value.length === 0);
+		return isEmpty ? message : true;
+	};
+
+export const gatedContent = defineType({
+	name: "gatedContent",
+	title: "Gated Content",
+	type: "document",
+	icon: gatedContentIcon,
+	description:
+		"Content hidden behind a lead-capture gate. Everyone sees the teaser; the payload is withheld from the page until the visitor submits the form.",
+	groups: [
+		{ name: "teaser", title: "Teaser", default: true },
+		{ name: "gate", title: "Gate" },
+		{ name: "content", title: "Gated Content" },
+	],
+	fields: [
+		defineField({
+			name: "internalTitle",
+			title: "Internal Title",
+			type: "string",
+			description: "Only used to identify this block in the Studio.",
+			validation: (Rule) => Rule.required(),
+		}),
+		defineField({
+			name: "teaserHeading",
+			title: "Teaser Heading",
+			type: "string",
+			group: "teaser",
+		}),
+		defineField({
+			name: "teaserBody",
+			title: "Teaser Body",
+			type: "richText",
+			group: "teaser",
+			description: "Shown to everyone, above the gate.",
+		}),
+		defineField({
+			name: "gateType",
+			title: "Unlock With",
+			type: "string",
+			group: "gate",
+			initialValue: "form",
+			options: {
+				list: [{ title: "Form submission", value: "form" }],
+				layout: "radio",
+			},
+			validation: (Rule) => Rule.required(),
+		}),
+		defineField({
+			name: "gateHeadline",
+			title: "Gate Headline",
+			type: "string",
+			group: "gate",
+			initialValue: "Unlock the full content",
+		}),
+		defineField({
+			name: "gateDescription",
+			title: "Gate Description",
+			type: "text",
+			rows: 3,
+			group: "gate",
+		}),
+		defineField({
+			name: "submitLabel",
+			title: "Submit Button Label",
+			type: "string",
+			group: "gate",
+			initialValue: "Unlock",
+		}),
+		defineField({
+			name: "successMessage",
+			title: "Success Message",
+			type: "string",
+			group: "gate",
+			description: "Shown briefly after the gate is unlocked.",
+		}),
+		defineField({
+			name: "kind",
+			title: "Content Type",
+			type: "string",
+			group: "content",
+			initialValue: "richText",
+			options: {
+				list: [
+					{ title: "Rich Text", value: "richText" },
+					{ title: "File (PDF, etc.)", value: "file" },
+					{ title: "Video", value: "video" },
+				],
+				layout: "radio",
+			},
+			validation: (Rule) => Rule.required(),
+		}),
+		defineField({
+			name: "content",
+			title: "Rich Text",
+			type: "richText",
+			group: "content",
+			description: "Revealed once the visitor completes the unlock action.",
+			hidden: ({ parent }) => (parent as GatedContentParent)?.kind !== "richText",
+			validation: (Rule) =>
+				Rule.custom(requiredForKind("richText", "Rich text is required.")),
+		}),
+		defineField({
+			name: "file",
+			title: "File",
+			type: "file",
+			group: "content",
+			description: "PDF or other downloadable asset, revealed on unlock.",
+			options: { accept: ".pdf,.doc,.docx,.zip,.epub,.csv,.xlsx" },
+			hidden: ({ parent }) => (parent as GatedContentParent)?.kind !== "file",
+			validation: (Rule) =>
+				Rule.custom((value: unknown, context) => {
+					const parent = context.parent as GatedContentParent | undefined;
+					if (parent?.kind !== "file") return true;
+					const asset = (value as { asset?: unknown } | undefined)?.asset;
+					return asset ? true : "A file is required.";
+				}),
+		}),
+		defineField({
+			name: "videoUrl",
+			title: "Video URL",
+			type: "url",
+			group: "content",
+			description: "External embed URL (YouTube, Vimeo, Mux…).",
+			hidden: ({ parent }) => (parent as GatedContentParent)?.kind !== "video",
+		}),
+		defineField({
+			name: "videoFile",
+			title: "Video File",
+			type: "file",
+			group: "content",
+			description: "Uploaded video, used when no Video URL is set.",
+			options: { accept: "video/*" },
+			hidden: ({ parent }) => (parent as GatedContentParent)?.kind !== "video",
+			validation: (Rule) =>
+				Rule.custom((value: unknown, context) => {
+					const parent = context.parent as
+						| (GatedContentParent & { videoUrl?: string })
+						| undefined;
+					if (parent?.kind !== "video") return true;
+					const asset = (value as { asset?: unknown } | undefined)?.asset;
+					if (parent?.videoUrl || asset) return true;
+					return "Add a Video URL or upload a video file.";
+				}),
+		}),
+	],
+	preview: {
+		select: {
+			title: "internalTitle",
+			heading: "teaserHeading",
+			kind: "kind",
+		},
+		prepare({ title, heading, kind }) {
+			return {
+				title: title || heading || "Gated Content",
+				subtitle: `Gated Content · ${getKindLabel(kind)}`,
+			};
+		},
+	},
+});

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/schemas/index.ts

@@ -8,7 +8,13 @@
  */
 
 import type { SchemaTypeDefinition } from "sanity";
-import { blogCollection, blogContent, description, hero } from "./components";
+import {
+	blogCollection,
+	blogContent,
+	description,
+	gatedContent,
+	hero,
+} from "./components";
 import { author } from "./content/author";
 import { blogCategory } from "./content/blog-category";
 import { companyData } from "./layout/company-data";
@@ -51,6 +57,7 @@ export {
 	externalLink,
 	faqJsonLd,
 	footer,
+	gatedContent,
 	hero,
 	itemListJsonLd,
 	jobPostingJsonLd,
@@ -103,6 +110,7 @@ export const schema: { types: SchemaTypeDefinition[] } = {
 		blogContent,
 		hero,
 		description,
+		gatedContent,
 
 		// Layout types (singletons for site-wide layout)
 		companyData,

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/schemas/shared/metadata.ts

@@ -9,12 +9,18 @@ export const metadata = defineType({
 		collapsible: true,
 		collapsed: true,
 	},
+	groups: [
+		{ name: "search", title: "Search", default: true },
+		{ name: "social", title: "Social sharing" },
+		{ name: "advanced", title: "Advanced" },
+	],
 	fields: [
 		defineField({
 			name: "metaTitle",
 			title: "Meta Title",
 			type: "string",
-			description: "Title used by search engines",
+			group: "search",
+			description: "Title used by search engines and browser tabs",
 			validation: (Rule) =>
 				Rule.max(60).warning(
 					"Title should be under 60 characters for optimal SEO",
@@ -25,25 +31,71 @@ export const metadata = defineType({
 			title: "Meta Description",
 			type: "text",
 			rows: 3,
+			group: "search",
 			description: "Description used by search engines",
 			validation: (Rule) =>
 				Rule.max(160).warning(
 					"Description should be under 160 characters for optimal SEO",
 				),
 		}),
+		defineField({
+			name: "keywords",
+			title: "Keywords",
+			type: "array",
+			group: "search",
+			of: [defineArrayMember({ type: "string" })],
+			options: { layout: "tags" },
+			description:
+				"Optional keywords/topics for this page. Press Enter after each.",
+		}),
 		defineField({
 			name: "image",
 			title: "OG Image",
 			type: "image",
+			group: "social",
 			description: "Image for social sharing previews (1200x630px recommended)",
 			options: {
 				hotspot: true,
 			},
 		}),
+		defineField({
+			name: "ogTitle",
+			title: "Social Title",
+			type: "string",
+			group: "social",
+			description:
+				"Title shown when shared on social (Open Graph & Twitter). Falls back to Meta Title.",
+			validation: (Rule) =>
+				Rule.max(70).warning("Social titles are often truncated past ~70 chars"),
+		}),
+		defineField({
+			name: "ogDescription",
+			title: "Social Description",
+			type: "text",
+			rows: 3,
+			group: "social",
+			description:
+				"Description shown when shared on social. Falls back to Meta Description.",
+			validation: (Rule) =>
+				Rule.max(200).warning(
+					"Social descriptions are often truncated past ~200 chars",
+				),
+		}),
+		defineField({
+			name: "canonicalUrl",
+			title: "Canonical URL",
+			type: "url",
+			group: "advanced",
+			description:
+				"Override the canonical URL for this page. Leave blank to use the page's own URL. Use for duplicate/syndicated content.",
+			validation: (Rule) =>
+				Rule.uri({ scheme: ["http", "https"], allowRelative: true }),
+		}),
 		defineField({
 			name: "index",
 			title: "Index",
 			type: "boolean",
+			group: "advanced",
 			description: "Allow search engines to index this page",
 			initialValue: true,
 		}),
@@ -51,6 +103,7 @@ export const metadata = defineType({
 			name: "jsonLd",
 			title: "Structured Data (JSON-LD)",
 			type: "array",
+			group: "advanced",
 			description:
 				"Page-level schema.org structured data emitted as JSON-LD. Pick a predefined type, or add a Custom JSON-LD block for anything not listed.",
 			of: pageJsonLdMembers.map((member) =>

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/schemas/shared/page-builder.ts

@@ -1,4 +1,5 @@
 import { defineArrayMember, defineType } from "sanity";
+import { BlockActionsItem } from "@/lib/integrations/sanity/components/block-actions-item";
 import { PageBuilderInput } from "@/lib/integrations/sanity/components/page-builder-input";
 import {
 	pageBuilderInsertMenuGroups,
@@ -22,6 +23,9 @@ export const pageBuilder = defineType({
 			title: member.title,
 			type: "reference",
 			to: [{ type: member.documentType }],
+			// Per-placement Hide/Show action; hidden state lives in the owning
+			// document's `hiddenPageBuilderKeys`, not on the ref itself.
+			components: { item: BlockActionsItem },
 			...(member.documentId
 				? {
 						options: {

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/schemas/shared/page.ts

@@ -204,6 +204,17 @@ export const page = defineType({
 					return `These page builder components do not belong to the "${pageType ?? "generic"}" category: ${invalidMemberTitles.join(", ")}`;
 				}),
 		}),
+		defineField({
+			name: "hiddenPageBuilderKeys",
+			title: "Hidden Blocks",
+			type: "array",
+			of: [{ type: "string" }],
+			// The `_key`s of page builder placements hidden on this page. Managed
+			// via each block's Hide/Show action (see BlockActionsItem); never edited
+			// directly. Declaring it keeps the Studio from warning about an unknown
+			// field. Filtered out at query time in `pageBuilderProjection`.
+			hidden: true,
+		}),
 		defineField({
 			name: "metadata",
 			title: "SEO & Metadata",

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/structure.ts

@@ -14,6 +14,7 @@ import {
 	contentFolderIcon,
 	contentIcon,
 	descriptionIcon,
+	gatedContentIcon,
 	heroIcon,
 	layoutFolderIcon,
 	pageFolderIcon,
@@ -294,6 +295,9 @@ export const structure: StructureResolver = (S, context) =>
 							S.documentTypeListItem("description")
 								.title("Descriptions")
 								.icon(descriptionIcon),
+							S.documentTypeListItem("gatedContent")
+								.title("Gated Content")
+								.icon(gatedContentIcon),
 							S.documentTypeListItem("blogContent")
 								.title("Blog Content")
 								.icon(contentIcon),

package/src/modules/features/cms/sanity-pagebuilder/files/lib/integrations/sanity/utils/page-builder-markdown.ts

@@ -29,6 +29,26 @@ export const renderPageBuilderMarkdown = (
 					return block.headline ? [`## ${block.headline}`, ""] : [];
 				case "description":
 					return block.description ? [block.description, ""] : [];
+				case "gatedContent": {
+					// The gated payload is withheld from the page query, so it is not
+					// available here either — only the teaser is emitted, matching what
+					// the page ships before the gate is unlocked.
+					const lines: string[] = [];
+					if (block.teaserHeading) lines.push(`## ${block.teaserHeading}`, "");
+					if (block.teaserBody) {
+						lines.push(
+							portableTextToMarkdown(
+								block.teaserBody as Parameters<
+									typeof portableTextToMarkdown
+								>[0],
+								markdownOptions,
+							),
+							"",
+						);
+					}
+					lines.push("> Gated content — unlock on the page to view.", "");
+					return lines;
+				}
 				case "blogContent": {
 					const lines: (string | null)[] = [];
 					const categories =

package/src/modules/features/cms/sanity-pagebuilder/files/lib/utils/metadata.ts

@@ -6,6 +6,9 @@ interface GenerateMetadataOptions {
 	title?: string | undefined;
 	description?: string | undefined;
 	keywords?: string[] | undefined;
+	ogTitle?: string | undefined;
+	ogDescription?: string | undefined;
+	canonicalUrl?: string | undefined;
 	image?:
 		| {
 				url?: string | undefined;
@@ -33,6 +36,10 @@ interface SanityMetadataImage {
 interface SanityPageMetadata {
 	metaTitle?: string | null;
 	metaDescription?: string | null;
+	keywords?: string[] | null;
+	ogTitle?: string | null;
+	ogDescription?: string | null;
+	canonicalUrl?: string | null;
 	og?: {
 		image?: SanityMetadataImage | null;
 	} | null;
@@ -81,6 +88,9 @@ const generatePageMetadata = (options: GenerateMetadataOptions): Metadata => {
 		title,
 		description,
 		keywords,
+		ogTitle,
+		ogDescription,
+		canonicalUrl,
 		image,
 		url,
 		siteName = "Basement",
@@ -98,29 +108,33 @@ const generatePageMetadata = (options: GenerateMetadataOptions): Metadata => {
 	const width = image?.width || 1200;
 	const height = image?.height || 630;
 
+	// Social title/description fall back to the SEO meta title/description.
+	const socialTitle = ogTitle || title;
+	const socialDescription = ogDescription || description;
+
 	const metadata: Metadata = {
 		metadataBase: new URL(APP_BASE_URL),
 		title,
 		description,
 		keywords,
-		alternates: { canonical: url || "/" },
+		alternates: { canonical: canonicalUrl || url || "/" },
 		openGraph: {
-			title,
-			description,
+			description: socialDescription,
 			url: fullUrl,
 			siteName,
 			locale: "en_US",
 			type,
 			images: [{ url: imageUrl, width, height }],
+			...(socialTitle && { title: socialTitle }),
 			...(publishedTime && { publishedTime }),
 			...(modifiedTime && { modifiedTime }),
 			...(authors && { authors }),
 		},
 		twitter: {
 			card: "summary_large_image",
-			title,
-			description,
+			description: socialDescription,
 			images: [{ url: imageUrl, width, height }],
+			...(socialTitle && { title: socialTitle }),
 		},
 		other: { "fb:app_id": process.env.NEXT_PUBLIC_FACEBOOK_APP_ID || "" },
 	};
@@ -155,9 +169,17 @@ export const generateSanityMetadata = ({
 		pageMetadata?.index ??
 		(pageMetadata?.noIndex != null ? !pageMetadata.noIndex : true);
 
+	const keywords = pageMetadata?.keywords?.length
+		? pageMetadata.keywords
+		: undefined;
+
 	return generatePageMetadata({
 		title,
 		description,
+		keywords,
+		ogTitle: pageMetadata?.ogTitle || undefined,
+		ogDescription: pageMetadata?.ogDescription || undefined,
+		canonicalUrl: pageMetadata?.canonicalUrl || undefined,
 		image: imageUrl ? { url: imageUrl, width: 1200, height: 630 } : undefined,
 		url,
 		siteName,

package/src/modules/features/env/dotenvx/files/setup-remote.ts

@@ -166,8 +166,10 @@ function main(): void {
 	}
 
 	// Push after connecting so the git integration builds the first deployment.
+	// `--no-verify` skips pre-push hooks — this is the initial scaffold push, and
+	// a hook failure here would strand it behind an already-created empty remote.
 	console.info("→ git push");
-	if (!run("git", ["push", "-u", "origin", "HEAD"], "git not found.")) {
+	if (!run("git", ["push", "-u", "origin", "HEAD", "--no-verify"], "git not found.")) {
 		console.error(
 			"\nConnected, but the push failed — run `git push` to trigger the first deploy.",
 		);

package/src/templates/next-default/.env.example

@@ -1,6 +1,7 @@
 # ============================================
 # Basement Next Starter - Environment Variables
 # ============================================
+# bsmnt:if dotenvx
 # This project uses dotenvx (https://dotenvx.com): the committed `.env` holds
 # shared values, with secrets encrypted there. The private keys live in
 # `.env.keys` (gitignored) — restore them with `bun run env:setup`.
@@ -15,6 +16,13 @@
 #
 # This file just documents the available variables; real values live in `.env`.
 # ============================================
+# bsmnt:endif
+# bsmnt:if !dotenvx
+# Copy this file to `.env.local` and fill in the values you need.
+# `.env.local` is gitignored, so real values stay off version control.
+# Only NEXT_PUBLIC_* variables are exposed to the browser.
+# ============================================
+# bsmnt:endif
 
 
 # ============================================

package/src/templates/next-default/.github/workflows/ci.yml

@@ -46,6 +46,7 @@ jobs:
       - name: Lint
         run: bun run lint
 
+      # bsmnt:if dotenvx
       # dotenvx needs the private key to decrypt secrets at build time. It's
       # pulled from 1Password via an org-wide service-account token + the op-ref
       # committed in .env. Optional: builds pass without it (only plaintext /
@@ -70,6 +71,12 @@ jobs:
           fi
           bun run build
 
+      # bsmnt:endif
+      # bsmnt:if !dotenvx
+      - name: Build
+        run: bun run build
+
+      # bsmnt:endif
       # Runs your tests if any exist; a fresh project with none passes cleanly.
       - name: Test
         run: |