@decocms/nextjs 8.6.0 → 8.7.0

package/README.md

@@ -52,7 +52,7 @@ export default async function DraftPage({ params, searchParams }) {
 }
 ```
 
-Published pages stay cached (ISR, below): the proxy sends only drafted requests to the draft route, sets the draft cookie, forwards the accepted version on `x-deco-version` (removing any copy sent from outside), and marks the response `Cache-Control: no-store, private` and `X-Robots-Tag: noindex, nofollow`. A layout that reads content goes with its route, so the cached pages read no request: under the draft route (`app/%5Fdraft/layout.tsx`) it calls `bindDraft(cms)` and `contentClient(cms)`, which read the forwarded headers; under the assignments route (`app/%5Fassignments/[assignments]/layout.tsx`) it reads through `await assignedClient(cms, (await params).assignments)`. `bindDraft` reads `headers()`, and a cached page that reads a request header renders on every request instead, so never call it in the root layout or on the assignments route.
+Published pages stay cached (ISR, below): the proxy sends only preview requests to the draft route (any `?__draft=`, `off` included, or the draft cookie; never the assignments route), sets the draft cookie, forwards the accepted version on `x-deco-version` (removing any copy sent from outside), and marks the response exactly `Cache-Control: max-age=0, no-cache, must-revalidate`, `Vary: Cookie` and `X-Robots-Tag: noindex, nofollow`. A draft request checks for the latest release once (`cms.checkRelease()`) and forwards the check's id on `x-deco-release-check` (removing any copy sent from outside): the proxy's host check and read of the draft, `bindDraft`'s host check and the page's `contentClient` all wait for that one check, so one preview request fetches `latest.json` once (a page in another process than the proxy makes one check of its own). It reads a link's draft before forwarding it: a draft that can't be read anymore renders the release, expires the cookie and tells the pages on `x-deco-draft-unavailable`, so `DraftPreviewIndicator` shows a calm notice instead of an error page. A layout that reads content goes with its route, so the cached pages read no request: under the draft route (`app/%5Fdraft/layout.tsx`) it calls `bindDraft(cms)` and `contentClient(cms)`, which read the forwarded headers; under the assignments route (`app/%5Fassignments/[assignments]/layout.tsx`) it reads through `await assignedClient(cms, (await params).assignments)`. `bindDraft` reads `headers()`, and a cached page that reads a request header renders on every request instead, so never call it in the root layout or on the assignments route.
 
 A draft link can carry a published release's commit SHA instead of a draft (Studio's "Preview this version"), and either one can carry a preview time (`__at`) and tests and campaigns switched on or off (`__test`, `__campaign`), which `cms.readVersion` reads as the client's `date`, `experiments` and `campaigns`. All of it passes the same host check and renders on the draft route: a visitor on the live site never picks a version. A preview may switch on a test at 0%.
 
@@ -155,7 +155,7 @@ const { withDeco } = require("@decocms/nextjs/config");
 module.exports = withDeco({ images: { loader: "custom", loaderFile: "./src/image-loader.ts" } });
 ```
 
-`withDeco` puts v7's two draft header rules before your own (a `?__draft=` query, or the draft cookie: no-store, `Vary: Cookie`, noindex) and adds Studio's origins to `allowedDevOrigins`. Each can be turned off: `withDeco(config, { draftHeaders: false, studioOrigins: false })`. Next sets `Cache-Control` and `Vary` itself on dynamic pages, so only `X-Robots-Tag` is sure to arrive from these rules; the proxy's `applyDraft` sets all three on the responses it makes.
+`withDeco` puts v7's two draft header rules before your own (a `?__draft=` query, or the draft cookie: `max-age=0, no-cache, must-revalidate`, `Vary: Cookie`, noindex) and adds Studio's origins to `allowedDevOrigins`. Each can be turned off: `withDeco(config, { draftHeaders: false, studioOrigins: false })`. Next sets `Cache-Control` and `Vary` itself on dynamic pages, so only `X-Robots-Tag` is sure to arrive from these rules; the proxy's `applyDraft` sets all three on the responses it makes.
 
 ## Request metric
 

package/dist/DraftPreviewIndicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DraftPreviewIndicator.d.ts","sourceRoot":"","sources":["../src/DraftPreviewIndicator.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,MAAM,WAAW,0BAA0B;IACzC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,GAAE,0BAA+B,GAAG,SAAS,CAI9F"}
+{"version":3,"file":"DraftPreviewIndicator.d.ts","sourceRoot":"","sources":["../src/DraftPreviewIndicator.tsx"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,MAAM,WAAW,0BAA0B;IACzC,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,GAAE,0BAA+B,GAAG,SAAS,CAI9F"}

package/dist/DraftPreviewIndicator.js

@@ -2,18 +2,19 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * The "Preview mode" badge for the request's draft: a Server Component that
  * renders `DraftBadge` (`@decocms/blocks/preview`) only when `bindDraft`
- * bound a draft, so a published page emits nothing.
+ * bound a draft, so a published page emits nothing; when the link named a
+ * draft that can't be read anymore, the badge's calm notice instead.
  *
  * Render it inside the page, after `bindDraft` was awaited, never from a
  * layout: a layout renders alongside the page that fills it, so it may run
  * before the page bound its draft.
  */
 import { DraftBadge } from "@decocms/blocks/preview";
-import { activeDraftPointer } from "./server/slot.js";
+import { activeDraftPointer, draftUnavailable } from "./server/slot.js";
 export function DraftPreviewIndicator({ exitHref } = {}) {
     const pointer = activeDraftPointer();
     if (!pointer)
-        return null;
+        return draftUnavailable() ? _jsx(DraftBadge, { pointer: null, unavailable: true }) : null;
     return _jsx(DraftBadge, { pointer: pointer, exitHref: exitHref });
 }
 //# sourceMappingURL=DraftPreviewIndicator.js.map

package/dist/DraftPreviewIndicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"DraftPreviewIndicator.js","sourceRoot":"","sources":["../src/DraftPreviewIndicator.tsx"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAOtD,MAAM,UAAU,qBAAqB,CAAC,EAAE,QAAQ,EAAE,GAA+B,EAAE;IACjF,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,KAAC,UAAU,IAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"DraftPreviewIndicator.js","sourceRoot":"","sources":["../src/DraftPreviewIndicator.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAOxE,MAAM,UAAU,qBAAqB,CAAC,EAAE,QAAQ,EAAE,GAA+B,EAAE;IACjF,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,IAAI,CAAC,OAAO;QAAE,OAAO,gBAAgB,EAAE,CAAC,CAAC,CAAC,KAAC,UAAU,IAAC,OAAO,EAAE,IAAI,EAAE,WAAW,SAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3F,OAAO,KAAC,UAAU,IAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAI,CAAC;AAC9D,CAAC"}

package/dist/draft.d.ts

@@ -27,13 +27,37 @@ export declare const DRAFT_COOKIE = "__deco_draft";
  * so a client can't send one itself.
  */
 export declare const VERSION_HEADER = "x-deco-version";
+/**
+ * The request header the proxy sets on a draft request it hands the pages:
+ * the id of the release check it made for it (`cms.checkRelease()`), so
+ * `bindDraft`'s host check and the page's draft reads wait for that check
+ * instead of making their own (one `latest.json` read per preview request).
+ * The proxy removes any copy that arrives from outside; an id the CMS didn't
+ * make (a proxy in another process) is a check of its own anyway.
+ */
+export declare const RELEASE_CHECK_HEADER = "x-deco-release-check";
 /** The URL prefix a drafted request is rewritten onto (`app/%5Fdraft/[[...path]]`). */
 export declare const DRAFT_ROUTE_PREFIX = "/_draft";
 /**
- * The response headers of a page rendered from a draft: never stored by a
- * browser or a CDN (`Cache-Control: no-store, private`, `Vary: Cookie`) and
- * never indexed (`X-Robots-Tag: noindex, nofollow`). `{}` when `version` is
- * `null`, so the result of the draft decision applies as is.
+ * The request header the proxy sets when the link named a draft that can't be
+ * read anymore (deleted, say): the pages render the release and
+ * `DraftPreviewIndicator` says so calmly. The proxy removes any copy that
+ * arrives from outside.
+ */
+export declare const DRAFT_UNAVAILABLE_HEADER = "x-deco-draft-unavailable";
+/**
+ * The `Cache-Control` of every response to a preview request (a request with
+ * `?__draft=`, whatever its value, or the draft cookie): always revalidated,
+ * never answered from a cache (PO 2026-10-23).
+ */
+export declare const DRAFT_CACHE_CONTROL = "max-age=0, no-cache, must-revalidate";
+/**
+ * The response headers of a preview: never answered from a browser's or a
+ * CDN's cache (`Cache-Control: max-age=0, no-cache, must-revalidate`, `Vary:
+ * Cookie`) and never indexed (`X-Robots-Tag: noindex, nofollow`). `{}` when
+ * `preview` is `null`, `false` or empty, so the result of the draft decision
+ * applies as is: pass the version, or whether the request carries a draft
+ * signal at all (`?__draft=off` and a refused or unavailable draft too).
  */
-export declare function draftResponseHeaders(version: string | null | undefined): Record<string, string>;
+export declare function draftResponseHeaders(preview: string | boolean | null | undefined): Record<string, string>;
 //# sourceMappingURL=draft.d.ts.map

package/dist/draft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../src/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;GAIG;AACH,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC;;;GAGG;AACH,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C,uFAAuF;AACvF,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAE5C;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO/F"}
+{"version":3,"file":"draft.d.ts","sourceRoot":"","sources":["../src/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;GAIG;AACH,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC;;;GAGG;AACH,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAE/C;;;;;;;GAOG;AACH,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,uFAAuF;AACvF,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAE5C;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,6BAA6B,CAAC;AAEnE;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAE1E;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAC3C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOxB"}

package/dist/draft.js

@@ -27,19 +27,43 @@ export const DRAFT_COOKIE = "__deco_draft";
  * so a client can't send one itself.
  */
 export const VERSION_HEADER = "x-deco-version";
+/**
+ * The request header the proxy sets on a draft request it hands the pages:
+ * the id of the release check it made for it (`cms.checkRelease()`), so
+ * `bindDraft`'s host check and the page's draft reads wait for that check
+ * instead of making their own (one `latest.json` read per preview request).
+ * The proxy removes any copy that arrives from outside; an id the CMS didn't
+ * make (a proxy in another process) is a check of its own anyway.
+ */
+export const RELEASE_CHECK_HEADER = "x-deco-release-check";
 /** The URL prefix a drafted request is rewritten onto (`app/%5Fdraft/[[...path]]`). */
 export const DRAFT_ROUTE_PREFIX = "/_draft";
 /**
- * The response headers of a page rendered from a draft: never stored by a
- * browser or a CDN (`Cache-Control: no-store, private`, `Vary: Cookie`) and
- * never indexed (`X-Robots-Tag: noindex, nofollow`). `{}` when `version` is
- * `null`, so the result of the draft decision applies as is.
+ * The request header the proxy sets when the link named a draft that can't be
+ * read anymore (deleted, say): the pages render the release and
+ * `DraftPreviewIndicator` says so calmly. The proxy removes any copy that
+ * arrives from outside.
+ */
+export const DRAFT_UNAVAILABLE_HEADER = "x-deco-draft-unavailable";
+/**
+ * The `Cache-Control` of every response to a preview request (a request with
+ * `?__draft=`, whatever its value, or the draft cookie): always revalidated,
+ * never answered from a cache (PO 2026-10-23).
+ */
+export const DRAFT_CACHE_CONTROL = "max-age=0, no-cache, must-revalidate";
+/**
+ * The response headers of a preview: never answered from a browser's or a
+ * CDN's cache (`Cache-Control: max-age=0, no-cache, must-revalidate`, `Vary:
+ * Cookie`) and never indexed (`X-Robots-Tag: noindex, nofollow`). `{}` when
+ * `preview` is `null`, `false` or empty, so the result of the draft decision
+ * applies as is: pass the version, or whether the request carries a draft
+ * signal at all (`?__draft=off` and a refused or unavailable draft too).
  */
-export function draftResponseHeaders(version) {
-    if (!version)
+export function draftResponseHeaders(preview) {
+    if (!preview)
         return {};
     return {
-        "Cache-Control": "no-store, private",
+        "Cache-Control": DRAFT_CACHE_CONTROL,
         Vary: "Cookie",
         "X-Robots-Tag": "noindex, nofollow",
     };

package/dist/draft.js.map

@@ -1 +1 @@
-{"version":3,"file":"draft.js","sourceRoot":"","sources":["../src/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC;AAErC;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC;AAE3C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAE/C,uFAAuF;AACvF,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAkC;IACrE,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,OAAO;QACL,eAAe,EAAE,mBAAmB;QACpC,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,mBAAmB;KACpC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"draft.js","sourceRoot":"","sources":["../src/draft.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,SAAS,CAAC;AAErC;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC;AAE3C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAE/C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;AAE3D,uFAAuF;AACvF,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,0BAA0B,CAAC;AAEnE;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,sCAAsC,CAAC;AAE1E;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAA4C;IAE5C,IAAI,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IACxB,OAAO;QACL,eAAe,EAAE,mBAAmB;QACpC,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,mBAAmB;KACpC,CAAC;AACJ,CAAC"}

package/dist/drafts.d.ts

@@ -46,7 +46,17 @@ export declare function requestLike(headers: Headers, pathAndQuery: string, fall
  * the preview's moment and switched tests and campaigns), or `null` for the
  * current release: what its Studio link carries, on a host the CMS allows.
  */
-export declare function allowedDraft(cms: Pick<CMS, "readVersion">, request: RequestLike): Promise<RequestVersion | null>;
+export declare function allowedDraft(cms: Pick<CMS, "readVersion">, request: RequestLike, releaseCheck?: string | null): Promise<RequestVersion | null>;
+/** Whether a version names a saved draft (a pointer, not a release's SHA and not `local`). */
+export declare function namesDraft(version: string): boolean;
+/**
+ * The release check of a request whose link names a draft
+ * (`cms.checkRelease()`), so its host check, its draft reads and its render
+ * share one read of `latest.json`: the one `forwarded` names when the CMS
+ * made it (the proxy's, for the same request), else a new one. `undefined`
+ * for any other request: the release, a release's SHA, no link.
+ */
+export declare function draftReleaseCheck(cms: Pick<CMS, "checkRelease">, request: RequestLike, forwarded?: string | null): Promise<string | undefined>;
 /**
  * The draft cookie: the same `Set-Cookie` `cms.draftCookie` writes (a test
  * holds the two together). Studio frames the site cross-site, hence

package/dist/drafts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,KAAK,GAAG,EAAgB,KAAK,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AA2BhG;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc,GAAG,IAAI,CAM5E;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAI5D;AAED,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,MAAM,GAAG,IAAI,CAIxF;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,WAAW,GAAG,IAAI,CAQpB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAC7B,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAIhC;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,MAAM,CAUvE;AAED,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAGlE"}
+{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EACL,KAAK,GAAG,EAGR,KAAK,WAAW,EAChB,KAAK,cAAc,EACpB,MAAM,iBAAiB,CAAC;AA2BzB;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,cAAc,GAAG,IAAI,CAM5E;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAI5D;AAED,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,MAAM,GAAG,IAAI,CAIxF;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,WAAW,GAAG,IAAI,CAQpB;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,EAC7B,OAAO,EAAE,WAAW,EACpB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAIhC;AAKD,8FAA8F;AAC9F,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGnD;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAC9B,OAAO,EAAE,WAAW,EACpB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GACxB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAI7B;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,MAAM,CAUvE;AAED,wFAAwF;AACxF,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAGlE"}

package/dist/drafts.js

@@ -21,7 +21,7 @@
  *
  * No React, no Next.js and no module state: the proxy and the pages share it.
  */
-import { parseVersion } from "@decocms/blocks";
+import { parseDraftPointer, parseVersion, } from "@decocms/blocks";
 import { DRAFT_COOKIE, DRAFT_PARAM } from "./draft.js";
 const DRAFT_OFF = "off";
 function draftParam(request) {
@@ -94,11 +94,31 @@ export function requestLike(headers, pathAndQuery, fallbackHost) {
  * the preview's moment and switched tests and campaigns), or `null` for the
  * current release: what its Studio link carries, on a host the CMS allows.
  */
-export async function allowedDraft(cms, request) {
+export async function allowedDraft(cms, request, releaseCheck) {
     const read = readDraftVersion(request);
     if (read === null)
         return null;
-    return (await cms.readVersion(request)) === null ? null : read;
+    return (await cms.readVersion(request, { releaseCheck })) === null ? null : read;
+}
+/** A draft pointer's version that names no draft: the release, nothing fetched. */
+const LOCAL_VERSION = "local";
+/** Whether a version names a saved draft (a pointer, not a release's SHA and not `local`). */
+export function namesDraft(version) {
+    const parsed = parseDraftPointer(version);
+    return parsed !== null && parsed.version !== LOCAL_VERSION;
+}
+/**
+ * The release check of a request whose link names a draft
+ * (`cms.checkRelease()`), so its host check, its draft reads and its render
+ * share one read of `latest.json`: the one `forwarded` names when the CMS
+ * made it (the proxy's, for the same request), else a new one. `undefined`
+ * for any other request: the release, a release's SHA, no link.
+ */
+export async function draftReleaseCheck(cms, request, forwarded) {
+    const read = readDraftVersion(request);
+    if (read === null || !namesDraft(read.version))
+        return undefined;
+    return cms.checkRelease(forwarded);
 }
 /**
  * The draft cookie: the same `Set-Cookie` `cms.draftCookie` writes (a test

package/dist/drafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../src/drafts.ts"],"names":[],"mappings":"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"}

package/dist/proxy/index.d.ts

@@ -30,8 +30,11 @@
  * (`contentClient`), deciding nothing again. It sends the visitor's cookie on
  * a first visit only, never from a preview.
  *
- * Cached (ISR) pages can't read a request, so a drafted request to one is
- * rewritten onto a dynamic draft route (`/_draft/<path>`, mounted as
+ * Cached (ISR) pages can't read a request, so a preview request (any draft
+ * signal: `?__draft=` with any value, `off` included, or the draft cookie) is
+ * rewritten onto a dynamic draft route, never cached, and answers
+ * `Cache-Control: max-age=0, no-cache, must-revalidate`; a drafted request
+ * is rewritten onto it (`/_draft/<path>`, mounted as
  * `app/%5Fdraft/...`: a literal `_draft` folder is private in Next and never
  * routes), and a published one onto the assignments route
  * (`/_assignments/<assignments>/<path>`, `rewriteToAssignmentsRoute`), where
@@ -52,8 +55,11 @@ import { type Visitor } from "@decocms/blocks/experiments";
 import { type NextRequest, NextResponse } from "next/server.js";
 import { type RequestAssignments } from "../assignments.ts";
 export { requestLike } from "../drafts.ts";
-/** What the draft decision needs from the CMS: its preview host check, and the release. */
-export type CMSHandle = Pick<CMS, "readVersion" | "forRelease">;
+/**
+ * What the draft decision needs from the CMS: its preview host check, the
+ * release, and the draft a link names (read once before the page renders).
+ */
+export type CMSHandle = Pick<CMS, "readVersion" | "forRelease" | "forDraft" | "checkRelease">;
 /** What the proxy does with a request's draft state. */
 export interface DraftDecision {
     /**
@@ -65,13 +71,36 @@ export interface DraftDecision {
     version: RequestVersion | null;
     /** The `Set-Cookie` the response carries: storing a link's version, or ending a preview. */
     setCookie: string | null;
+    /**
+     * The request carries a draft signal at all (`?__draft=` with any value, or
+     * the draft cookie): it renders on the draft route, never from a cache,
+     * and answers `draftResponseHeaders`, whatever `version` is.
+     */
+    preview?: boolean;
+    /**
+     * The link named a draft that can't be read (deleted, or its host
+     * failing): the release renders, the cookie is expired when the draft is
+     * gone (a failure that may pass leaves it), and the pages show
+     * the calm notice (`x-deco-draft-unavailable`), never an error page.
+     */
+    unavailable?: true;
+    /**
+     * The release check made for this draft request (`cms.checkRelease()`),
+     * forwarded on `x-deco-release-check`: the host check, the draft read here
+     * and the page's all wait for it, so the request reads `latest.json` once.
+     */
+    releaseCheck?: string;
 }
 export { ASSIGNMENTS_HEADER, ASSIGNMENTS_ROUTE_PREFIX, assignmentsKey, assignmentsRoutePath, assignmentsSegment, isAssignmentsRoutePath, type PathAssignments, parseAssignmentsSegment, type RequestAssignments, readAssignments, } from "../assignments.ts";
 export { DRAFT_ROUTE_PREFIX, VERSION_HEADER } from "../draft.ts";
 /**
  * The version a request renders and the cookie its response sets, on a host
  * the CMS allows (as the pages' `bindDraft` checks again). A request with
- * no `?__draft=` and no draft cookie never reaches the CMS.
+ * no `?__draft=` and no draft cookie never reaches the CMS. A draft request
+ * checks for the latest release once (`cms.checkRelease()`), shared by the
+ * host check, the read below and the page. A draft pointer
+ * is read once here (`forDraft(...).revision()`, the read the page makes
+ * again): a draft that can't be read gives the release and `unavailable`.
  */
 export declare function decideDraft(cms: CMSHandle, request: NextRequest | Request): Promise<DraftDecision>;
 /**
@@ -107,8 +136,9 @@ export declare function visitorRequestHeaders(headers: Headers, decision: Visito
 export declare function applyVisitor<R extends Response>(response: R, decision: VisitorDecision): R;
 /**
  * Each test and campaign on or off for this request, decided once:
- * `cms.client({ visitor, ...version })` (the visitor, and the Studio link's
- * version, moment and switched tests and campaigns) resolving the saved
+ * `cms.client({ visitor, ...version, releaseCheck })` (the visitor, the Studio
+ * link's version, moment and switched tests and campaigns, and the request's
+ * release check) resolving the saved
  * `experiments` and `campaigns` blocks. Missing blocks, or content that
  * doesn't load, give none, never an error.
  */
@@ -122,10 +152,12 @@ export declare function assignmentsRequestHeaders(headers: Headers, assignments:
 /** Whether `pathname` is on the draft route: a site answers a direct hit there with its 404. */
 export declare function isDraftRoutePath(pathname: string): boolean;
 /**
- * The rewrite of a drafted request onto the draft route, keeping its path and
- * forwarding the version and, when given, the visitor (`decideVisitor`) and
- * the assignments (`decideAssignments`); `null` when the request isn't
- * drafted or is already on the draft route.
+ * The rewrite of a preview request (a drafted one, or any other with a draft
+ * signal: `off`, a refused host, a draft that can't be read) onto the draft
+ * route, which is dynamic and never cached, keeping its path and forwarding
+ * the version and, when given, the visitor (`decideVisitor`) and the
+ * assignments (`decideAssignments`); `null` when the request isn't a preview
+ * or is already on the draft route.
  */
 export declare function rewriteToDraftRoute(request: NextRequest, decision: DraftDecision, visitor?: VisitorDecision, assignments?: RequestAssignments): NextResponse | null;
 /**
@@ -143,7 +175,7 @@ export declare function rewriteToDraftRoute(request: NextRequest, decision: Draf
  * minutes stale (the first request after that still gets it while Next
  * renders it again), a banner switching on late, which is accepted.
  *
- * `null` for a drafted request (it renders on the draft route, never cached)
+ * `null` for a preview request (it renders on the draft route, never cached)
  * and for a path already on the draft or assignments route. When the content
  * saves tests or campaigns, the response is marked `Cache-Control: private,
  * no-cache`: Next keeps one cached page per set of assignments, but the URL
@@ -154,11 +186,15 @@ export declare function rewriteToDraftRoute(request: NextRequest, decision: Draf
  */
 export declare function rewriteToAssignmentsRoute(cms: Pick<CMS, "client">, request: NextRequest, draft: DraftDecision, visitor: VisitorDecision): Promise<NextResponse | null>;
 /**
- * The cookie and the response headers of a draft: `Set-Cookie`, and for a
- * drafted response `Cache-Control: no-store, private`, `Vary: Cookie` and
+ * The cookie and the response headers of a preview: `Set-Cookie`, and for
+ * any request with a draft signal (`preview`, or a version)
+ * `Cache-Control: max-age=0, no-cache, must-revalidate`, `Vary: Cookie` and
  * `X-Robots-Tag: noindex, nofollow` (`draftResponseHeaders`). With the
  * version in a cookie a draft shares its URL with the published page, so a
- * cache keyed on the URL alone would serve it to visitors.
+ * cache keyed on the URL alone would serve it to visitors. The proxy answers
+ * before the page renders, so it can't hold the cookie back from a failed
+ * render; `decideDraft` reads the draft first instead, and a draft that
+ * can't be read expires the cookie.
  */
 export declare function applyDraft<R extends Response>(response: R, decision: DraftDecision): R;
 export interface DraftProxyOptions {

package/dist/proxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/proxy/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/proxy/index.ts"],"names":[],"mappings":"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"}

package/dist/proxy/index.js

@@ -1,17 +1,27 @@
 import { readVisitor, serializeVisitor } from "@decocms/blocks/experiments";
 import { NextResponse } from "next/server.js";
 import { ASSIGNMENTS_HEADER, assignmentsRoutePath, assignmentsSegment, isAssignmentsRoutePath, readAssignmentsAndScope, } from "../assignments.js";
-import { DRAFT_ROUTE_PREFIX, draftResponseHeaders, VERSION_HEADER } from "../draft.js";
-import { allowedDraft, draftCookie, draftLinkValue, endsPreview, hasDraftSignal, requestLike, } from "../drafts.js";
+import { DRAFT_ROUTE_PREFIX, DRAFT_UNAVAILABLE_HEADER, draftResponseHeaders, RELEASE_CHECK_HEADER, VERSION_HEADER, } from "../draft.js";
+import { allowedDraft, draftCookie, draftLinkValue, draftReleaseCheck, endsPreview, hasDraftSignal, requestLike, } from "../drafts.js";
 import { VISITOR_HEADER } from "../visitor.js";
 export { requestLike } from "../drafts.js";
 export { ASSIGNMENTS_HEADER, ASSIGNMENTS_ROUTE_PREFIX, assignmentsKey, assignmentsRoutePath, assignmentsSegment, isAssignmentsRoutePath, parseAssignmentsSegment, readAssignments, } from "../assignments.js";
 export { DRAFT_ROUTE_PREFIX, VERSION_HEADER } from "../draft.js";
 const INERT = Object.freeze({ version: null, setCookie: null });
+/** A preview that renders the release (`off`, a refused host, a value that doesn't parse). */
+const RELEASE_PREVIEW = Object.freeze({
+    version: null,
+    setCookie: null,
+    preview: true,
+});
 /**
  * The version a request renders and the cookie its response sets, on a host
  * the CMS allows (as the pages' `bindDraft` checks again). A request with
- * no `?__draft=` and no draft cookie never reaches the CMS.
+ * no `?__draft=` and no draft cookie never reaches the CMS. A draft request
+ * checks for the latest release once (`cms.checkRelease()`), shared by the
+ * host check, the read below and the page. A draft pointer
+ * is read once here (`forDraft(...).revision()`, the read the page makes
+ * again): a draft that can't be read gives the release and `unavailable`.
  */
 export async function decideDraft(cms, request) {
     const url = new URL(request.url);
@@ -20,15 +30,55 @@ export async function decideDraft(cms, request) {
         return INERT;
     // Ending a preview is allowed on any host, so a cookie set earlier always goes.
     if (endsPreview(like))
-        return { version: null, setCookie: draftCookie("", ["Max-Age=0"]) };
-    const version = await allowedDraft(cms, like);
+        return { ...RELEASE_PREVIEW, setCookie: expiredCookie() };
+    // One release check per draft request, shared below and by the page.
+    const releaseCheck = await draftReleaseCheck(cms, like);
+    const version = await allowedDraft(cms, like, releaseCheck);
     if (version === null)
-        return INERT;
+        return RELEASE_PREVIEW;
+    if (releaseCheck !== undefined) {
+        try {
+            await cms.forDraft(version.version, { releaseCheck }).revision();
+        }
+        catch (error) {
+            // Gone (deleted): the preview ends. Any other failure (the drafts' host
+            // down, a timeout) leaves the cookie alone, so the next request tries again.
+            const setCookie = isDraftGone(error) ? expiredCookie() : null;
+            return { ...RELEASE_PREVIEW, setCookie, unavailable: true };
+        }
+    }
     const link = draftLinkValue(like);
-    return { version, setCookie: link ? draftCookie(encodeURIComponent(link)) : null };
+    return {
+        version,
+        setCookie: link ? draftCookie(encodeURIComponent(link)) : null,
+        preview: true,
+        ...(releaseCheck === undefined ? {} : { releaseCheck }),
+    };
+}
+/**
+ * Whether a draft read failed because the drafts' host no longer has the
+ * draft (`404`/`410`), as opposed to a failure that may pass (a `5xx`, a
+ * timeout, a network error). Reads the error and its causes.
+ */
+function isDraftGone(error) {
+    for (let e = error, depth = 0; e instanceof Error && depth < 5; e = e.cause, depth++) {
+        if (/draft changes: HTTP (404|410)\b/.test(e.message))
+            return true;
+    }
+    return false;
+}
+/** The `Set-Cookie` that ends a preview. */
+function expiredCookie() {
+    return draftCookie("", ["Max-Age=0"]);
 }
 /** The headers the proxy writes for the pages: never taken from outside. */
-const OWN_HEADERS = [VERSION_HEADER, VISITOR_HEADER, ASSIGNMENTS_HEADER];
+const OWN_HEADERS = [
+    VERSION_HEADER,
+    VISITOR_HEADER,
+    ASSIGNMENTS_HEADER,
+    DRAFT_UNAVAILABLE_HEADER,
+    RELEASE_CHECK_HEADER,
+];
 /**
  * The request headers to forward: the accepted version on `x-deco-version`,
  * so the root layout can bind the draft on the same request (a layout gets no
@@ -43,6 +93,11 @@ export function draftRequestHeaders(request, decision) {
         headers.delete(name);
     if (decision.version)
         headers.set(VERSION_HEADER, decision.version.version);
+    if (decision.version && decision.releaseCheck) {
+        headers.set(RELEASE_CHECK_HEADER, decision.releaseCheck);
+    }
+    if (decision.unavailable)
+        headers.set(DRAFT_UNAVAILABLE_HEADER, "1");
     return headers;
 }
 /** Whether the visitor asked over https (`x-forwarded-proto` first, as a host in front reports it). */
@@ -84,13 +139,20 @@ export function applyVisitor(response, decision) {
 }
 /**
  * Each test and campaign on or off for this request, decided once:
- * `cms.client({ visitor, ...version })` (the visitor, and the Studio link's
- * version, moment and switched tests and campaigns) resolving the saved
+ * `cms.client({ visitor, ...version, releaseCheck })` (the visitor, the Studio
+ * link's version, moment and switched tests and campaigns, and the request's
+ * release check) resolving the saved
  * `experiments` and `campaigns` blocks. Missing blocks, or content that
  * doesn't load, give none, never an error.
  */
 export function decideAssignments(cms, draft, visitor) {
-    return readAssignmentsAndScope(cms, { visitor: visitor.visitor, ...draft.version }).then((read) => read.assignments);
+    // A draft's read shares the request's release check (`decideDraft`), never one of its own.
+    const releaseCheck = draft.version ? draft.releaseCheck : undefined;
+    return readAssignmentsAndScope(cms, {
+        visitor: visitor.visitor,
+        ...draft.version,
+        ...(releaseCheck ? { releaseCheck } : {}),
+    }).then((read) => read.assignments);
 }
 /**
  * The forwarded headers with the decided tests and campaigns on
@@ -116,13 +178,15 @@ export function isDraftRoutePath(pathname) {
     return pathname === DRAFT_ROUTE_PREFIX || pathname.startsWith(`${DRAFT_ROUTE_PREFIX}/`);
 }
 /**
- * The rewrite of a drafted request onto the draft route, keeping its path and
- * forwarding the version and, when given, the visitor (`decideVisitor`) and
- * the assignments (`decideAssignments`); `null` when the request isn't
- * drafted or is already on the draft route.
+ * The rewrite of a preview request (a drafted one, or any other with a draft
+ * signal: `off`, a refused host, a draft that can't be read) onto the draft
+ * route, which is dynamic and never cached, keeping its path and forwarding
+ * the version and, when given, the visitor (`decideVisitor`) and the
+ * assignments (`decideAssignments`); `null` when the request isn't a preview
+ * or is already on the draft route.
  */
 export function rewriteToDraftRoute(request, decision, visitor, assignments) {
-    if (!decision.version)
+    if (!decision.version && !decision.preview)
         return null;
     const url = request.nextUrl.clone();
     if (isDraftRoutePath(url.pathname))
@@ -149,7 +213,7 @@ const ASSIGNED_CACHE_CONTROL = "private, no-cache";
  * minutes stale (the first request after that still gets it while Next
  * renders it again), a banner switching on late, which is accepted.
  *
- * `null` for a drafted request (it renders on the draft route, never cached)
+ * `null` for a preview request (it renders on the draft route, never cached)
  * and for a path already on the draft or assignments route. When the content
  * saves tests or campaigns, the response is marked `Cache-Control: private,
  * no-cache`: Next keeps one cached page per set of assignments, but the URL
@@ -159,7 +223,7 @@ const ASSIGNED_CACHE_CONTROL = "private, no-cache";
  * (`isAssignmentsRoutePath`).
  */
 export async function rewriteToAssignmentsRoute(cms, request, draft, visitor) {
-    if (draft.version)
+    if (draft.version || draft.preview)
         return null;
     const url = request.nextUrl.clone();
     if (isDraftRoutePath(url.pathname) || isAssignmentsRoutePath(url.pathname))
@@ -176,16 +240,21 @@ export async function rewriteToAssignmentsRoute(cms, request, draft, visitor) {
     return response;
 }
 /**
- * The cookie and the response headers of a draft: `Set-Cookie`, and for a
- * drafted response `Cache-Control: no-store, private`, `Vary: Cookie` and
+ * The cookie and the response headers of a preview: `Set-Cookie`, and for
+ * any request with a draft signal (`preview`, or a version)
+ * `Cache-Control: max-age=0, no-cache, must-revalidate`, `Vary: Cookie` and
  * `X-Robots-Tag: noindex, nofollow` (`draftResponseHeaders`). With the
  * version in a cookie a draft shares its URL with the published page, so a
- * cache keyed on the URL alone would serve it to visitors.
+ * cache keyed on the URL alone would serve it to visitors. The proxy answers
+ * before the page renders, so it can't hold the cookie back from a failed
+ * render; `decideDraft` reads the draft first instead, and a draft that
+ * can't be read expires the cookie.
  */
 export function applyDraft(response, decision) {
     if (decision.setCookie)
         response.headers.append("set-cookie", decision.setCookie);
-    for (const [name, value] of Object.entries(draftResponseHeaders(decision.version?.version))) {
+    const preview = decision.preview === true || decision.version !== null;
+    for (const [name, value] of Object.entries(draftResponseHeaders(preview))) {
         response.headers.set(name, value);
     }
     return response;
@@ -204,7 +273,7 @@ export function draftProxy(cms, options = {}) {
         }
         const decision = await decideDraft(cms, request);
         const visitor = decideVisitor(request, decision);
-        const onAssignmentsRoute = decision.version === null && assignments?.(request) === true;
+        const onAssignmentsRoute = decision.version === null && decision.preview !== true && assignments?.(request) === true;
         const rewritten = onAssignmentsRoute
             ? await rewriteToAssignmentsRoute(cms, request, decision, visitor)
             : null;