bsmnt 0.10.0 → 0.12.0

package/dist/modules/presets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/presets/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC5C,iBAAiB;IACjB,qBAAqB;IACrB,eAAe;IACf,qBAAqB;CACrB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/modules/presets/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAmB;IAC5C,iBAAiB;IACjB,qBAAqB;IACrB,0BAA0B;IAC1B,eAAe;IACf,qBAAqB;CACrB,CAAC"}

package/dist/modules/presets/next-pagebuilder-cache.d.ts

@@ -0,0 +1,3 @@
+import type { PresetModule } from "../../core/create/types.js";
+export declare const nextPagebuilderCachePreset: PresetModule;
+//# sourceMappingURL=next-pagebuilder-cache.d.ts.map

package/dist/modules/presets/next-pagebuilder-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"next-pagebuilder-cache.d.ts","sourceRoot":"","sources":["../../../src/modules/presets/next-pagebuilder-cache.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,eAAO,MAAM,0BAA0B,EAAE,YAQxC,CAAC"}

package/dist/modules/presets/next-pagebuilder-cache.js

@@ -0,0 +1,10 @@
+import { PRESET_MODULE_IDS, SANITY_PAGEBUILDER_CACHE_FEATURE_MODULE_ID, } from "../../core/create/internal-ids.js";
+export const nextPagebuilderCachePreset = {
+    id: PRESET_MODULE_IDS["next-pagebuilder-cache"],
+    kind: "preset",
+    label: "Page Builder (Cache Components)",
+    description: "Page builder preset adopted for Next.js Cache Components (next-sanity v13 strict mode)",
+    template: "next-pagebuilder-cache",
+    defaultFeatures: [SANITY_PAGEBUILDER_CACHE_FEATURE_MODULE_ID],
+};
+//# sourceMappingURL=next-pagebuilder-cache.js.map

package/dist/modules/presets/next-pagebuilder-cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"next-pagebuilder-cache.js","sourceRoot":"","sources":["../../../src/modules/presets/next-pagebuilder-cache.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,iBAAiB,EACjB,0CAA0C,GAC1C,MAAM,mCAAmC,CAAC;AAG3C,MAAM,CAAC,MAAM,0BAA0B,GAAiB;IACvD,EAAE,EAAE,iBAAiB,CAAC,wBAAwB,CAAC;IAC/C,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,iCAAiC;IACxC,WAAW,EACV,wFAAwF;IACzF,QAAQ,EAAE,wBAAwB;IAClC,eAAe,EAAE,CAAC,0CAA0C,CAAC;CAC7D,CAAC"}

package/dist/paths.d.ts

@@ -19,6 +19,12 @@ export declare const SANITY_FILES_DIR: string;
  * relative to the project root.
  */
 export declare const SANITY_PAGEBUILDER_FILES_DIR: string;
+/**
+ * Directory containing the Cache Components variant of the Sanity Page Builder
+ * integration source files. Resolves to
+ * `src/modules/features/cms/sanity-pagebuilder-cache/files/`.
+ */
+export declare const SANITY_PAGEBUILDER_CACHE_FILES_DIR: string;
 /**
  * Directory containing the HubSpot integration source files.
  * Always resolves to `src/modules/features/forms/hubspot/files/` relative to the

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAaA,6DAA6D;AAC7D,eAAO,MAAM,aAAa,EAAE,MAI3B,CAAC;AAEF,0DAA0D;AAC1D,eAAO,MAAM,kBAAkB,EAAE,MAIhC,CAAC;AAEF,gFAAgF;AAChF,eAAO,MAAM,gBAAgB,EAAE,MAI9B,CAAC;AAEF,mGAAmG;AACnG,eAAO,MAAM,uBAAuB,EAAE,MAKrC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAQ9B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,EAAE,MAQ1C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAQ/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAQ/B,CAAC"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAaA,6DAA6D;AAC7D,eAAO,MAAM,aAAa,EAAE,MAI3B,CAAC;AAEF,0DAA0D;AAC1D,eAAO,MAAM,kBAAkB,EAAE,MAIhC,CAAC;AAEF,gFAAgF;AAChF,eAAO,MAAM,gBAAgB,EAAE,MAI9B,CAAC;AAEF,mGAAmG;AACnG,eAAO,MAAM,uBAAuB,EAAE,MAKrC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAQ9B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,EAAE,MAQ1C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,EAAE,MAQhD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAQ/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,EAAE,MAQ/B,CAAC"}

package/dist/paths.js

@@ -29,6 +29,12 @@ export const SANITY_FILES_DIR = path.join(PROJECT_ROOT, "src", "modules", "featu
  * relative to the project root.
  */
 export const SANITY_PAGEBUILDER_FILES_DIR = path.join(PROJECT_ROOT, "src", "modules", "features", "cms", "sanity-pagebuilder", "files");
+/**
+ * Directory containing the Cache Components variant of the Sanity Page Builder
+ * integration source files. Resolves to
+ * `src/modules/features/cms/sanity-pagebuilder-cache/files/`.
+ */
+export const SANITY_PAGEBUILDER_CACHE_FILES_DIR = path.join(PROJECT_ROOT, "src", "modules", "features", "cms", "sanity-pagebuilder-cache", "files");
 /**
  * Directory containing the HubSpot integration source files.
  * Always resolves to `src/modules/features/forms/hubspot/files/` relative to the

package/dist/paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,GAAW,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1D,MAAM,SAAS,GAAW,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnD;;;;GAIG;AACH,MAAM,YAAY,GAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAE3D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,aAAa,GAAW,IAAI,CAAC,IAAI,CAC7C,YAAY,EACZ,KAAK,EACL,WAAW,CACX,CAAC;AAEF,0DAA0D;AAC1D,MAAM,CAAC,MAAM,kBAAkB,GAAW,IAAI,CAAC,IAAI,CAClD,YAAY,EACZ,KAAK,EACL,gBAAgB,CAChB,CAAC;AAEF,gFAAgF;AAChF,MAAM,CAAC,MAAM,gBAAgB,GAAW,IAAI,CAAC,IAAI,CAChD,YAAY,EACZ,KAAK,EACL,cAAc,CACd,CAAC;AAEF,mGAAmG;AACnG,MAAM,CAAC,MAAM,uBAAuB,GAAW,IAAI,CAAC,IAAI,CACvD,YAAY,EACZ,KAAK,EACL,QAAQ,EACR,wBAAwB,CACxB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAW,IAAI,CAAC,IAAI,CAChD,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,QAAQ,EACR,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAW,IAAI,CAAC,IAAI,CAC5D,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,oBAAoB,EACpB,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAW,IAAI,CAAC,IAAI,CACjD,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAW,IAAI,CAAC,IAAI,CACjD,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,SAAS,EACT,OAAO,CACP,CAAC"}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,GAAW,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1D,MAAM,SAAS,GAAW,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAEnD;;;;GAIG;AACH,MAAM,YAAY,GAAW,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;AAE3D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,aAAa,GAAW,IAAI,CAAC,IAAI,CAC7C,YAAY,EACZ,KAAK,EACL,WAAW,CACX,CAAC;AAEF,0DAA0D;AAC1D,MAAM,CAAC,MAAM,kBAAkB,GAAW,IAAI,CAAC,IAAI,CAClD,YAAY,EACZ,KAAK,EACL,gBAAgB,CAChB,CAAC;AAEF,gFAAgF;AAChF,MAAM,CAAC,MAAM,gBAAgB,GAAW,IAAI,CAAC,IAAI,CAChD,YAAY,EACZ,KAAK,EACL,cAAc,CACd,CAAC;AAEF,mGAAmG;AACnG,MAAM,CAAC,MAAM,uBAAuB,GAAW,IAAI,CAAC,IAAI,CACvD,YAAY,EACZ,KAAK,EACL,QAAQ,EACR,wBAAwB,CACxB,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAW,IAAI,CAAC,IAAI,CAChD,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,QAAQ,EACR,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAW,IAAI,CAAC,IAAI,CAC5D,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,oBAAoB,EACpB,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kCAAkC,GAAW,IAAI,CAAC,IAAI,CAClE,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,0BAA0B,EAC1B,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAW,IAAI,CAAC,IAAI,CACjD,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,OAAO,EACP,SAAS,EACT,OAAO,CACP,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAW,IAAI,CAAC,IAAI,CACjD,YAAY,EACZ,KAAK,EACL,SAAS,EACT,UAAU,EACV,KAAK,EACL,SAAS,EACT,OAAO,CACP,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bsmnt",
-	"version": "0.10.0",
+	"version": "0.12.0",
 	"packageManager": "bun@1.3.14",
 	"description": "CLI to scaffold basement projects and add integrations",
 	"type": "module",
@@ -22,10 +22,12 @@
 		"!src/templates/*/node_modules",
 		"!src/templates/*/.next",
 		"!src/templates/*/bun.lock",
+		"!src/templates/*/*.tsbuildinfo",
 		"src/template-hooks",
 		"src/agent-skills",
 		"src/modules/features/cms/sanity/files",
 		"src/modules/features/cms/sanity-pagebuilder/files",
+		"src/modules/features/cms/sanity-pagebuilder-cache/files",
 		"src/modules/features/forms/hubspot/files",
 		"src/modules/features/env/dotenvx/files",
 		"src/assets"
@@ -62,6 +64,7 @@
 		"version-canary": "changeset version --snapshot canary",
 		"release-canary": "changeset publish --tag canary --no-git-tag",
 		"test:templates": "bash scripts/test-templates.sh",
+		"check:pagebuilder": "bash scripts/typecheck-pagebuilder.sh",
 		"link:local": "bash scripts/build-and-link.sh",
 		"unlink:local": "bash scripts/build-and-link.sh --unlink"
 	},
@@ -98,6 +101,6 @@
 		"lefthook": "^1.13.0",
 		"tsx": "^4.19.0",
 		"turbo": "^2.5.0",
-		"typescript": "^5.8.0"
+		"typescript": "^7.0.2"
 	}
 }

package/src/modules/features/cms/sanity/files/components/ui/sanity-image/index.tsx

@@ -2,7 +2,8 @@ import { getImageDimensions } from "@sanity/asset-utils";
 import { Image, type ImageProps } from "@/components/ui/image";
 import { urlForImage } from "@/lib/integrations/sanity/utils/image";
 
-interface SanityImageProps extends Omit<ImageProps, "src" | "aspectRatio"> {
+interface SanityImageBaseProps
+	extends Omit<ImageProps, "src" | "aspectRatio" | "sizes" | "width" | "height"> {
 	image: {
 		asset?: {
 			_ref: string;
@@ -15,6 +16,38 @@ interface SanityImageProps extends Omit<ImageProps, "src" | "aspectRatio"> {
 	maxWidth?: number;
 }
 
+type SanityImageProps = SanityImageBaseProps &
+	(
+		| { sizes: string; width?: never; height?: never }
+		| { width: number; height: number; sizes?: string }
+	);
+
+const MAX_SOURCE_WIDTH = 3840;
+
+const isGifRef = (ref: string) => ref.endsWith("-gif");
+
+const getImageSrc = (
+	image: SanityImageProps["image"],
+	maxWidth: number,
+	croppedWidth: number,
+) => {
+	const builder = urlForImage(image);
+	const ref = image.asset?._ref ?? "";
+
+	if (ref.endsWith("-svg")) return builder.url();
+
+	const requestWidth = Math.min(maxWidth, MAX_SOURCE_WIDTH, croppedWidth);
+	const { left, right, top, bottom } = image.crop ?? {};
+	const hasCrop = Boolean(left || right || top || bottom);
+	const isGif = isGifRef(ref);
+
+	if (!(isGif || hasCrop) && requestWidth >= croppedWidth) {
+		return builder.url();
+	}
+
+	return builder.width(requestWidth).url();
+};
+
 export function SanityImage({
 	image,
 	maxWidth = 1920,
@@ -39,11 +72,10 @@ export function SanityImage({
 
 	return (
 		<Image
-			src={urlForImage(image)
-				.width(Math.min(maxWidth, sourceWidth))
-				.url()}
+			src={getImageSrc(image, maxWidth, sourceWidth)}
 			alt={alt || image.alt || ""}
 			aspectRatio={sourceWidth / sourceHeight}
+			unoptimized={isGifRef(image.asset._ref)}
 			{...imageProps}
 			{...props}
 		/>

package/src/modules/features/cms/sanity/files/lib/integrations/check-integration.ts

@@ -1,3 +1,5 @@
+import { dataset, projectId } from "@/lib/integrations/sanity/env";
+
 /**
  * Integration Configuration Checker
  *
@@ -16,14 +18,13 @@
  */
 
 /**
- * Check if Sanity CMS is configured
- * Requires: NEXT_PUBLIC_SANITY_PROJECT_ID and NEXT_PUBLIC_SANITY_DATASET
+ * Check if Sanity CMS is configured. Derived from env.ts, not a second read of
+ * `process.env`: read directly these disagreed — env.ts also accepts
+ * `SANITY_STUDIO_PROJECT_ID` and defaults the dataset — so a resolvable project
+ * reported itself unconfigured.
  */
 export function isSanityConfigured(): boolean {
-	return Boolean(
-		process.env.NEXT_PUBLIC_SANITY_PROJECT_ID &&
-			process.env.NEXT_PUBLIC_SANITY_DATASET,
-	);
+	return Boolean(projectId && dataset);
 }
 
 /**

package/src/modules/features/cms/sanity/files/lib/integrations/sanity/README.md

@@ -14,7 +14,7 @@ SANITY_API_READ_TOKEN="your-viewer-token"
 
 # Optional
 NEXT_PUBLIC_SANITY_STUDIO_URL="http://localhost:3000/studio"
-NEXT_PUBLIC_SANITY_API_VERSION="2024-03-15"
+NEXT_PUBLIC_SANITY_API_VERSION="2025-02-19"
 ```
 
 > **Note**: Create a **Viewer** token in [Sanity Dashboard](https://sanity.io/manage) → Your Project → API → Tokens and set it as `SANITY_API_READ_TOKEN`.

package/src/modules/features/cms/sanity/files/lib/integrations/sanity/components/rich-text.tsx

@@ -37,7 +37,13 @@ export function RichText({ content }: RichTextProps) {
 			value={content}
 			components={{
 				types: {
-					image: ({ value }) => <SanityImage image={value} maxWidth={1920} />,
+					image: ({ value }) => (
+						<SanityImage
+							image={value}
+							maxWidth={1920}
+							sizes="(min-width: 768px) 768px, 100vw"
+						/>
+					),
 				},
 				marks: {
 					link: ({ children, value }) => {
@@ -51,6 +57,7 @@ export function RichText({ content }: RichTextProps) {
 								rel={
 									isExternal && value?.blank ? "noopener noreferrer" : undefined
 								}
+								className="text-blue underline underline-offset-2 transition-opacity hover:opacity-70"
 								data-sanity-edit-target
 							>
 								{children}

package/src/modules/features/cms/sanity/files/lib/integrations/sanity/env.ts

@@ -6,9 +6,9 @@
  * if Sanity is properly set up before making API calls.
  */
 
-/** Sanity API version - defaults to latest stable */
+/** Floor, not a preference: Content Releases need 2025-02-19 or later. */
 export const apiVersion =
-	process.env.NEXT_PUBLIC_SANITY_API_VERSION || "2024-03-15";
+	process.env.NEXT_PUBLIC_SANITY_API_VERSION || "2025-02-19";
 
 /** Sanity dataset name - defaults to 'production' */
 export const dataset = process.env.NEXT_PUBLIC_SANITY_DATASET || "production";

package/src/modules/features/cms/sanity-pagebuilder/files/app/api/[[...slug]]/route.ts

@@ -5,6 +5,7 @@ import { PAGE_QUERY } from "@/lib/integrations/sanity/queries";
 import type { PAGE_QUERY_RESULT } from "@/lib/integrations/sanity/sanity.types";
 import { renderPageBuilderMarkdown } from "@/lib/integrations/sanity/utils/page-builder-markdown";
 import { getBaseUrl } from "@/lib/utils/base-url";
+import { getSlugTag } from "@/lib/utils/slug-tag";
 
 type PageResult = NonNullable<PAGE_QUERY_RESULT>;
 
@@ -57,6 +58,9 @@ export async function GET(
 	const { data } = await sanityFetch({
 		query: PAGE_QUERY,
 		params: { slug },
+		// This route answers at /api/<slug>.md, which no `revalidatePath` on the
+		// page path reaches. The tag is the only thing that clears it.
+		tags: [getSlugTag(slug)],
 	});
 
 	const page = data as PageResult | null;

package/src/modules/features/cms/sanity-pagebuilder/files/app/api/revalidate/route.ts

@@ -1,16 +1,37 @@
 import { revalidatePath, revalidateTag } from "next/cache";
 import { type NextRequest, NextResponse } from "next/server";
 import { parseBody } from "next-sanity/webhook";
-import { client } from "@/lib/integrations/sanity/client";
+// `directClient`, never `client`: the shared client runs `useCdn: true`, and every
+// lookup here reads state the mutation that triggered this request just produced.
+// A CDN hit returns the pre-mutation slug or folder chain, which purges the old
+// path twice and never touches the new one.
+import { directClient } from "@/lib/integrations/sanity/client";
 import { SANITY_LAYOUT_TAGS } from "@/lib/integrations/sanity/fetchers/layout";
 import { SANITY_REDIRECTS_TAG } from "@/lib/integrations/sanity/fetchers/redirects";
 import { pageBuilderReferenceMembers as pbrm } from "@/lib/integrations/sanity/page-builder-config";
 import {
-	P_REF_PB_COMP_QUERY,
+	FOLDER_PATH_QUERY,
+	P_REF_DOC_PAGES_QUERY,
+	P_REV_FOLDER_DESCENDANTS_QUERY,
 	P_REV_SLUGS_QUERY,
 } from "@/lib/integrations/sanity/queries";
-import type { P_REF_PB_COMP_QUERY_RESULT } from "@/lib/integrations/sanity/sanity.types";
+import {
+	composeDescendantPaths,
+	composeResolvedSlug,
+} from "@/lib/integrations/sanity/revalidate-paths";
+import type {
+	FOLDER_PATH_QUERY_RESULT,
+	P_REF_DOC_PAGES_QUERY_RESULT,
+	P_REV_FOLDER_DESCENDANTS_QUERY_RESULT,
+} from "@/lib/integrations/sanity/sanity.types";
+import {
+	BLOG_COLLECTION_TAGS,
+	BLOG_COLLECTION_TYPES,
+	CROSS_DOC_TAG_DEPENDENCIES,
+	REFERENCEABLE_TYPES,
+} from "@/lib/integrations/sanity/tags";
 import { getPagePath } from "@/lib/utils/sitemap";
+import { getSlugTag } from "@/lib/utils/slug-tag";
 
 const ERRORS = {
 	BAD_REQ: ["Bad Request", { status: 400 }],
@@ -21,11 +42,16 @@ type WebhookSlug = {
 	current?: string | null;
 };
 
+type WebhookReference = {
+	_ref?: string | null;
+};
+
 type WebhookDocument = {
 	_id: string;
 	_type: string;
-	resolvedSlug?: string | null;
 	slug?: WebhookSlug | null;
+	pageFolder?: WebhookReference | null;
+	parentFolder?: WebhookReference | null;
 };
 
 type MutationOperation = "create" | "update" | "delete";
@@ -36,7 +62,27 @@ type RevalidateWebhookBody = WebhookDocument & {
 	after?: Partial<WebhookDocument> | null;
 };
 
-const pageBuilderComponent = new Set<string>(pbrm.map((m) => m.documentType));
+const referenceableTypes = new Set<string>([
+	...pbrm.map((m) => m.documentType),
+	...REFERENCEABLE_TYPES,
+]);
+
+// Not `"max"`: a named profile expires a year out, so Next serves the stale entry
+// once while refreshing. A publish should land on the next request, not the one after.
+const PURGE = { expire: 0 } as const;
+
+const bustTags = (tags: readonly string[]) => {
+	for (const tag of tags) {
+		revalidateTag(tag, PURGE);
+	}
+};
+
+// Both: the path clears the page's route, the tag clears what no page render
+// touches — above all the markdown route, which answers at /api/<slug>.md.
+const bustPage = (slug: string | null) => {
+	revalidatePath(getPagePath(slug));
+	revalidateTag(getSlugTag(slug), PURGE);
+};
 
 const normalizeRevalidationSlug = (slug: string | null | undefined) => {
 	if (slug === undefined) return null;
@@ -45,9 +91,9 @@ const normalizeRevalidationSlug = (slug: string | null | undefined) => {
 };
 
 const getCanonicalPageSlug = async (documentId: string) => {
-	if (!client) return null;
+	if (!directClient) return null;
 
-	const pageSlugs = await client.fetch<Array<{ slug: string | null }>>(
+	const pageSlugs = await directClient.fetch<Array<{ slug: string | null }>>(
 		P_REV_SLUGS_QUERY,
 		{ documentIds: [documentId] },
 	);
@@ -57,24 +103,114 @@ const getCanonicalPageSlug = async (documentId: string) => {
 	);
 };
 
-const getPagesThatReferenceComp = async (documentId: string) => {
-	if (!client) return [];
+const getFolder = async (folderId: string | null | undefined) => {
+	if (!(directClient && folderId)) return null;
 
-	const pages = await client.fetch<P_REF_PB_COMP_QUERY_RESULT>(
-		P_REF_PB_COMP_QUERY,
-		{
-			documentId,
-		},
+	const folder = await directClient.fetch<FOLDER_PATH_QUERY_RESULT>(
+		FOLDER_PATH_QUERY,
+		{ folderId },
+	);
+
+	return folder ?? null;
+};
+
+const getPagesReferencing = async (documentIds: readonly string[]) => {
+	if (!(directClient && documentIds.length)) return [];
+
+	const pages = await directClient.fetch<P_REF_DOC_PAGES_QUERY_RESULT>(
+		P_REF_DOC_PAGES_QUERY,
+		{ documentIds },
 	);
 
 	return (pages ?? []).map((page) => normalizeRevalidationSlug(page.slug));
 };
 
+// The webhook carries the raw document, so a page's URL has to be rebuilt from
+// its folder — `slug.current` alone is the page's own segment, which is empty
+// for a folder-index page and missing the prefix for every nested one.
+//
+// `undefined` means "no such revision", distinct from the `null` that a page at
+// the site root legitimately resolves to. Without that split, a payload missing
+// its `before()` projection would purge the homepage on every delete.
+const resolvePageSlug = async (
+	revision: Partial<WebhookDocument> | null | undefined,
+) => {
+	if (!revision) return undefined;
+
+	const folder = await getFolder(revision.pageFolder?._ref);
+
+	return composeResolvedSlug(folder?.path ?? null, revision.slug?.current);
+};
+
+// A folder rename or reparent rewrites the URL of everything beneath it. Neither
+// the folder nor its descendants are `page` mutations, so nothing else in this
+// route would touch them.
+const revalidateFolderSubtree = async (body: RevalidateWebhookBody) => {
+	const { before, after } = body;
+
+	const previousFolderSlug = before?.slug?.current;
+	const moved =
+		previousFolderSlug !== after?.slug?.current ||
+		before?.parentFolder?._ref !== after?.parentFolder?._ref;
+
+	// A folder edit that touches neither the slug nor the parent — a title, say —
+	// changes no URL. `pageFolder` still busts the navbar and collection tags
+	// through CROSS_DOC_TAG_DEPENDENCIES below.
+	//
+	// Deletion is skipped outright: `pageFolder` and `parentFolder` are plain hard
+	// references, so Sanity refuses to delete a folder that still has descendants.
+	// There is no orphaned subtree to unwind, and querying for one would just cost
+	// two round trips to find nothing.
+	if (body.operation === "delete") return [];
+	if (!(directClient && moved && previousFolderSlug)) return [];
+
+	const previousParent = await getFolder(before?.parentFolder?._ref);
+
+	const descendants =
+		await directClient.fetch<P_REV_FOLDER_DESCENDANTS_QUERY_RESULT>(
+			P_REV_FOLDER_DESCENDANTS_QUERY,
+			{ folderId: body._id },
+		);
+
+	const movedIds: string[] = [];
+
+	for (const descendant of descendants ?? []) {
+		const paths = composeDescendantPaths({
+			folderChain: descendant.folderChain ?? [],
+			ownSlug: descendant.ownSlug,
+			folderId: body._id,
+			previousFolderSlug,
+			previousParentPath: previousParent?.path ?? null,
+		});
+
+		if (!paths) {
+			console.error("Revalidation: unresolvable folder chain", descendant._id);
+			continue;
+		}
+
+		movedIds.push(descendant._id);
+		bustPage(paths.current);
+		bustPage(paths.previous);
+	}
+
+	// Pages linking *into* the subtree inline the old resolved slugs too.
+	return getPagesReferencing(movedIds);
+};
+
 const getAffectedPageSlugsForWebhook = async (body: RevalidateWebhookBody) => {
 	const pages: Array<string | null> = [];
 
-	if (body.operation === "delete" && body?.before?.slug?.current) {
-		revalidateTag(body.before.slug.current, "max");
+	if (body._type === "page" && body.before) {
+		const previousSlug = await resolvePageSlug(body.before);
+
+		// Resolved, not raw: a page moved to another folder keeps its own slug and
+		// still vacates its old URL, so comparing own slugs would miss it.
+		const vacated =
+			body.operation === "delete" ||
+			(body.operation === "update" &&
+				previousSlug !== (await resolvePageSlug(body.after)));
+
+		if (vacated && previousSlug !== undefined) bustPage(previousSlug);
 	}
 
 	// If the document is a page, get its slug
@@ -83,13 +219,17 @@ const getAffectedPageSlugsForWebhook = async (body: RevalidateWebhookBody) => {
 		if (data !== null) pages.push(data);
 	}
 
-	// If the document is a page builder component, get the page slugs that reference it
-	if (pageBuilderComponent.has(body._type)) {
-		const data = await getPagesThatReferenceComp(body._id);
-		pages.push(...data);
+	// Page-builder blocks, `author`, `blogCategory` and other pages are all
+	// inlined into pages that no other branch here revalidates.
+	if (referenceableTypes.has(body._type)) {
+		pages.push(...(await getPagesReferencing([body._id])));
 	}
 
-	return pages.filter((page): page is string => page !== null);
+	if (body._type === "pageFolder") {
+		pages.push(...(await revalidateFolderSubtree(body)));
+	}
+
+	return [...new Set(pages.filter((page): page is string => page !== null))];
 };
 
 export async function POST(request: NextRequest) {
@@ -107,15 +247,23 @@ export async function POST(request: NextRequest) {
 		const affectedPageSlugs = await getAffectedPageSlugsForWebhook(body);
 
 		for (const slug of affectedPageSlugs) {
-			revalidatePath(getPagePath(slug));
+			bustPage(slug);
 		}
 
 		if (SANITY_LAYOUT_TAGS.includes(body?._type)) {
-			revalidateTag(body._type, "max");
+			revalidateTag(body._type, PURGE);
 		}
 
+		// Queries that read across document types — a `structuredData` entry that
+		// folds in `companyData`, a navbar that derefs pages.
+		bustTags(CROSS_DOC_TAG_DEPENDENCIES[body._type] ?? []);
+
+		// The content-collection block caches list/count/categories under their own
+		// tags, which no per-page revalidation above touches.
+		if (BLOG_COLLECTION_TYPES.has(body._type)) bustTags(BLOG_COLLECTION_TAGS);
+
 		if (body._type === SANITY_REDIRECTS_TAG) {
-			revalidateTag(SANITY_REDIRECTS_TAG, "max");
+			revalidateTag(SANITY_REDIRECTS_TAG, PURGE);
 		}
 
 		return NextResponse.json({ status: 200, now: Date.now() });

package/src/modules/features/cms/sanity-pagebuilder/files/app/feed.xml/route.ts

@@ -1,20 +1,27 @@
+import { fetchSanity } from "@/lib/integrations/sanity/live";
 import { ALL_BLOG_ARTICLES_QUERY } from "@/lib/integrations/sanity/queries";
+import type { ALL_BLOG_ARTICLES_QUERY_RESULT } from "@/lib/integrations/sanity/sanity.types";
+import { FEED_TAG } from "@/lib/integrations/sanity/tags";
 import { generateRssFeed, rssErrorResponse } from "@/lib/utils/rss";
 import { getPageUrl, getSitemapBaseUrl } from "@/lib/utils/sitemap";
 
-export const dynamic = "force-dynamic";
-
+// Not `force-dynamic`: feed readers poll, so per-request rendering charged a
+// Sanity round trip per poll. The webhook busts FEED_TAG for `page`, `pageFolder`,
+// `author` and `blogCategory` — this query derefs the byline and resolves slugs
+// through folder chains.
 export async function GET() {
 	const baseUrl = getSitemapBaseUrl();
 
 	try {
-		const sanityModule = await import("@/lib/integrations/sanity/client");
-		const client = sanityModule?.client;
-		if (!client) return rssErrorResponse();
+		const { data: articles } =
+			await fetchSanity<ALL_BLOG_ARTICLES_QUERY_RESULT>({
+				query: ALL_BLOG_ARTICLES_QUERY,
+				tags: [FEED_TAG],
+			});
 
-		const articles = await client.fetch(ALL_BLOG_ARTICLES_QUERY);
+		if (!articles) return rssErrorResponse();
 
-		const items = (articles ?? [])
+		const items = articles
 			.filter((article) => article.resolvedSlug && !article.noIndex)
 			.map((article) => ({
 				title: article.title ?? "Untitled",

package/src/modules/features/cms/sanity-pagebuilder/files/app/sitemap.md/route.ts

@@ -7,7 +7,8 @@ import {
 	getSitemapBaseUrl,
 } from "@/lib/utils/sitemap";
 
-export const dynamic = "force-dynamic";
+// Cached, not per-request: this bills itself as being for AI agents, so its
+// traffic is crawler-driven. `getSitemap` tags the read; the webhook busts it.
 
 type PageDoc = PAGE_SITEMAP_QUERY_RESULT[number];
 
@@ -117,7 +118,6 @@ export const GET = async () => {
 			headers: {
 				"Content-Type": "text/markdown; charset=utf-8",
 				"X-Content-Type-Options": "nosniff",
-				"Cache-Control": "public, s-maxage=3600, stale-while-revalidate=600",
 			},
 		});
 	} catch (error) {

package/src/modules/features/cms/sanity-pagebuilder/files/app/studio/[[...tool]]/page.tsx

@@ -1,8 +1,23 @@
 "use client";
 
 import { NextStudio } from "next-sanity/studio";
+import { isSanityConfigured } from "@/lib/integrations/check-integration";
 import config from "@/lib/integrations/sanity/sanity.config";
 
-const StudioPage = () => <NextStudio config={config} />;
+// The Studio throws on an empty `projectId`, which `env.ts` falls back to when
+// Sanity isn't configured — so this route would fail `next build`.
+const StudioPage = () =>
+	isSanityConfigured() ? (
+		<NextStudio config={config} />
+	) : (
+		<main style={{ padding: "2rem", fontFamily: "system-ui, sans-serif" }}>
+			<h1>Studio unavailable</h1>
+			<p>
+				Set <code>NEXT_PUBLIC_SANITY_PROJECT_ID</code> and{" "}
+				<code>NEXT_PUBLIC_SANITY_DATASET</code>, then restart, to load the
+				embedded Studio.
+			</p>
+		</main>
+	);
 
 export default StudioPage;

package/src/modules/features/cms/sanity-pagebuilder/files/components/sanity/rich-text.tsx

@@ -26,6 +26,7 @@ const LinkMark = ({ children, value }: LinkMarkProps) => {
 			href={href}
 			target={attrs.target}
 			rel={attrs.rel}
+			className="text-blue underline underline-offset-2 transition-opacity hover:opacity-70"
 			data-sanity-edit-target
 		>
 			{children}
@@ -41,7 +42,13 @@ export const RichText = ({ content }: RichTextProps) => {
 			value={content}
 			components={{
 				types: {
-					image: ({ value }) => <SanityImage image={value} maxWidth={1920} />,
+					image: ({ value }) => (
+						<SanityImage
+							image={value}
+							maxWidth={1920}
+							sizes="(min-width: 768px) 768px, 100vw"
+						/>
+					),
 					table: ({ value }) => {
 						const rows = value?.rows as
 							| Array<{ _key?: string; cells?: string[] }>