camox 0.58.1 → 0.60.2

package/dist/features/renderer/RendererApp.js

@@ -113,9 +113,10 @@ function RendererApp(t0) {
 }
 /** A block's thumbnail, rendered by the draft's code into its frame: nothing for a block it lacks. */
 function RendererThumbnail(t0) {
-	const $ = c(9);
+	const $ = c(17);
 	const { slot, blockType, camoxApp } = t0;
 	const frameWindow = slot.ownerDocument.defaultView;
+	const left = useLeftInSlot(slot);
 	const t1 = frameWindow?.frameElement ?? null;
 	let t2;
 	if ($[0] !== frameWindow || $[1] !== t1) {
@@ -130,32 +131,55 @@ function RendererThumbnail(t0) {
 	const frameContext = t2;
 	let t3;
 	if ($[3] !== blockType || $[4] !== camoxApp) {
-		t3 = /* @__PURE__ */ jsx(ThumbnailErrorBoundary, { children: /* @__PURE__ */ jsx(React.Suspense, {
-			fallback: null,
-			children: /* @__PURE__ */ jsx(ThumbnailBlock, {
-				blockType,
-				camoxApp
-			})
-		}) });
+		t3 = /* @__PURE__ */ jsx(ThumbnailBlock, {
+			blockType,
+			camoxApp
+		});
 		$[3] = blockType;
 		$[4] = camoxApp;
 		$[5] = t3;
 	} else t3 = $[5];
 	let t4;
-	if ($[6] !== frameContext || $[7] !== t3) {
-		t4 = /* @__PURE__ */ jsx(NavigationProvider, {
+	if ($[6] !== left) {
+		t4 = /* @__PURE__ */ jsx(RemovesLeft, { nodes: left });
+		$[6] = left;
+		$[7] = t4;
+	} else t4 = $[7];
+	let t5;
+	if ($[8] !== t3 || $[9] !== t4) {
+		t5 = /* @__PURE__ */ jsxs(React.Suspense, {
+			fallback: null,
+			children: [t3, t4]
+		});
+		$[8] = t3;
+		$[9] = t4;
+		$[10] = t5;
+	} else t5 = $[10];
+	let t6;
+	if ($[11] !== left || $[12] !== t5) {
+		t6 = /* @__PURE__ */ jsx(ThumbnailErrorBoundary, {
+			left,
+			children: t5
+		});
+		$[11] = left;
+		$[12] = t5;
+		$[13] = t6;
+	} else t6 = $[13];
+	let t7;
+	if ($[14] !== frameContext || $[15] !== t6) {
+		t7 = /* @__PURE__ */ jsx(NavigationProvider, {
 			location: THUMBNAIL_LOCATION,
 			navigate: noNavigation,
 			children: /* @__PURE__ */ jsx(FrameContext.Provider, {
 				value: frameContext,
-				children: t3
+				children: t6
 			})
 		});
-		$[6] = frameContext;
-		$[7] = t3;
-		$[8] = t4;
-	} else t4 = $[8];
-	return t4;
+		$[14] = frameContext;
+		$[15] = t6;
+		$[16] = t7;
+	} else t7 = $[16];
+	return t7;
 }
 const THUMBNAIL_LOCATION = {
 	href: "",
@@ -173,7 +197,7 @@ var ThumbnailErrorBoundary = class extends React.Component {
 		console.error("Camox: a block's thumbnail failed to render.", error);
 	}
 	render() {
-		return this.state.failed ? null : this.props.children;
+		return this.state.failed ? /* @__PURE__ */ jsx(RemovesLeft, { nodes: this.props.left }) : this.props.children;
 	}
 };
 function ThumbnailBlock(t0) {
@@ -188,6 +212,46 @@ function ThumbnailBlock(t0) {
 	} else t1 = $[1];
 	return t1;
 }
+/**
+* What another renderer document left in `slot`, read before this one renders into it. Each new
+* revision loads another renderer document, and removing the last one's frame never unmounts
+* what it rendered into the studio's frames, so its page stays there.
+*/
+function useLeftInSlot(slot) {
+	const $ = c(2);
+	let t0;
+	if ($[0] !== slot) {
+		t0 = () => [...slot.childNodes];
+		$[0] = slot;
+		$[1] = t0;
+	} else t0 = $[1];
+	const [left] = React.useState(t0);
+	return left;
+}
+/**
+* Removes the nodes another renderer left, once what replaces them commits: until then, the
+* frame keeps showing the last page rather than nothing.
+*/
+function RemovesLeft(t0) {
+	const $ = c(3);
+	const { nodes } = t0;
+	let t1;
+	let t2;
+	if ($[0] !== nodes) {
+		t1 = () => {
+			for (const node of nodes) node.remove();
+		};
+		t2 = [nodes];
+		$[0] = nodes;
+		$[1] = t1;
+		$[2] = t2;
+	} else {
+		t1 = $[1];
+		t2 = $[2];
+	}
+	React.useLayoutEffect(t1, t2);
+	return null;
+}
 function locationOf(href) {
 	const url = new URL(href);
 	return {
@@ -199,10 +263,11 @@ function locationOf(href) {
 }
 /** One frame's page, with what the studio says of the frame around it. */
 function RendererFrameContent(t0) {
-	const $ = c(59);
+	const $ = c(65);
 	const { frame: t1, connection, camoxApp, codeLoaded, projectUuid, runtimeBasePath } = t0;
 	const { frameId, slot, target } = t1;
 	const frameWindow = slot.ownerDocument.defaultView;
+	const left = useLeftInSlot(slot);
 	const frameElement = frameWindow?.frameElement ?? null;
 	let t2;
 	if ($[0] !== target.href) {
@@ -293,17 +358,14 @@ function RendererFrameContent(t0) {
 	} else t9 = $[18];
 	let t10;
 	if ($[19] !== camoxApp || $[20] !== codeLoaded || $[21] !== projectUuid || $[22] !== rendered || $[23] !== runtimeBasePath || $[24] !== target.derivedLayoutId || $[25] !== target.pathname) {
-		t10 = /* @__PURE__ */ jsx(React.Suspense, {
-			fallback: t9,
-			children: /* @__PURE__ */ jsx(FramePage, {
-				camoxApp,
-				codeLoaded,
-				projectUuid,
-				runtimeBasePath,
-				pathname: target.pathname,
-				derivedLayoutId: target.derivedLayoutId,
-				onRendered: rendered
-			})
+		t10 = /* @__PURE__ */ jsx(FramePage, {
+			camoxApp,
+			codeLoaded,
+			projectUuid,
+			runtimeBasePath,
+			pathname: target.pathname,
+			derivedLayoutId: target.derivedLayoutId,
+			onRendered: rendered
 		});
 		$[19] = camoxApp;
 		$[20] = codeLoaded;
@@ -315,110 +377,128 @@ function RendererFrameContent(t0) {
 		$[26] = t10;
 	} else t10 = $[26];
 	let t11;
-	if ($[27] !== failed || $[28] !== t10 || $[29] !== target.pathname) {
-		t11 = /* @__PURE__ */ jsx(FrameErrorBoundary, {
-			onError: failed,
-			children: t10
-		}, target.pathname);
-		$[27] = failed;
-		$[28] = t10;
-		$[29] = target.pathname;
-		$[30] = t11;
-	} else t11 = $[30];
+	if ($[27] !== left) {
+		t11 = /* @__PURE__ */ jsx(RemovesLeft, { nodes: left });
+		$[27] = left;
+		$[28] = t11;
+	} else t11 = $[28];
 	let t12;
-	if ($[31] !== t11 || $[32] !== t8) {
-		t12 = /* @__PURE__ */ jsx(React.Activity, {
-			mode: t8,
-			children: t11
+	if ($[29] !== t10 || $[30] !== t11) {
+		t12 = /* @__PURE__ */ jsxs(React.Suspense, {
+			fallback: t9,
+			children: [t10, t11]
 		});
-		$[31] = t11;
-		$[32] = t8;
-		$[33] = t12;
-	} else t12 = $[33];
+		$[29] = t10;
+		$[30] = t11;
+		$[31] = t12;
+	} else t12 = $[31];
 	let t13;
-	if ($[34] !== t12 || $[35] !== target.artifactStudio) {
-		t13 = /* @__PURE__ */ jsx(ArtifactStudioContext, {
-			value: target.artifactStudio,
+	if ($[32] !== failed || $[33] !== left || $[34] !== t12 || $[35] !== target.pathname) {
+		t13 = /* @__PURE__ */ jsx(FrameErrorBoundary, {
+			onError: failed,
+			left,
 			children: t12
-		});
+		}, target.pathname);
+		$[32] = failed;
+		$[33] = left;
 		$[34] = t12;
-		$[35] = target.artifactStudio;
+		$[35] = target.pathname;
 		$[36] = t13;
 	} else t13 = $[36];
 	let t14;
-	if ($[37] !== t13 || $[38] !== target.artifactsRun) {
-		t14 = /* @__PURE__ */ jsx(ArtifactsRunContext, {
-			value: target.artifactsRun,
+	if ($[37] !== t13 || $[38] !== t8) {
+		t14 = /* @__PURE__ */ jsx(React.Activity, {
+			mode: t8,
 			children: t13
 		});
 		$[37] = t13;
-		$[38] = target.artifactsRun;
+		$[38] = t8;
 		$[39] = t14;
 	} else t14 = $[39];
 	let t15;
-	if ($[40] !== t14 || $[41] !== target.editable) {
-		t15 = /* @__PURE__ */ jsx(EditableSurfaceContext, {
-			value: target.editable,
+	if ($[40] !== t14 || $[41] !== target.artifactStudio) {
+		t15 = /* @__PURE__ */ jsx(ArtifactStudioContext, {
+			value: target.artifactStudio,
 			children: t14
 		});
 		$[40] = t14;
-		$[41] = target.editable;
+		$[41] = target.artifactStudio;
 		$[42] = t15;
 	} else t15 = $[42];
 	let t16;
-	if ($[43] !== t15 || $[44] !== workspace) {
-		t16 = /* @__PURE__ */ jsx(CanvasWorkspaceContext, {
-			value: workspace,
+	if ($[43] !== t15 || $[44] !== target.artifactsRun) {
+		t16 = /* @__PURE__ */ jsx(ArtifactsRunContext, {
+			value: target.artifactsRun,
 			children: t15
 		});
 		$[43] = t15;
-		$[44] = workspace;
+		$[44] = target.artifactsRun;
 		$[45] = t16;
 	} else t16 = $[45];
 	let t17;
-	if ($[46] !== t16 || $[47] !== target.owner) {
-		t17 = /* @__PURE__ */ jsx(PreviewEditingOwnerContext, {
-			value: target.owner,
+	if ($[46] !== t16 || $[47] !== target.editable) {
+		t17 = /* @__PURE__ */ jsx(EditableSurfaceContext, {
+			value: target.editable,
 			children: t16
 		});
 		$[46] = t16;
-		$[47] = target.owner;
+		$[47] = target.editable;
 		$[48] = t17;
 	} else t17 = $[48];
 	let t18;
-	if ($[49] !== frameContext || $[50] !== t17) {
-		t18 = /* @__PURE__ */ jsx(FrameContext.Provider, {
-			value: frameContext,
+	if ($[49] !== t17 || $[50] !== workspace) {
+		t18 = /* @__PURE__ */ jsx(CanvasWorkspaceContext, {
+			value: workspace,
 			children: t17
 		});
-		$[49] = frameContext;
-		$[50] = t17;
+		$[49] = t17;
+		$[50] = workspace;
 		$[51] = t18;
 	} else t18 = $[51];
 	let t19;
-	if ($[52] !== location || $[53] !== navigate || $[54] !== t18) {
-		t19 = /* @__PURE__ */ jsx(NavigationProvider, {
-			location,
-			navigate,
+	if ($[52] !== t18 || $[53] !== target.owner) {
+		t19 = /* @__PURE__ */ jsx(PreviewEditingOwnerContext, {
+			value: target.owner,
 			children: t18
 		});
-		$[52] = location;
-		$[53] = navigate;
-		$[54] = t18;
-		$[55] = t19;
-	} else t19 = $[55];
-	const content = t19;
+		$[52] = t18;
+		$[53] = target.owner;
+		$[54] = t19;
+	} else t19 = $[54];
 	let t20;
-	if ($[56] !== content || $[57] !== target.locale) {
-		t20 = target.locale ? /* @__PURE__ */ jsx(ViewLocaleContext, {
+	if ($[55] !== frameContext || $[56] !== t19) {
+		t20 = /* @__PURE__ */ jsx(FrameContext.Provider, {
+			value: frameContext,
+			children: t19
+		});
+		$[55] = frameContext;
+		$[56] = t19;
+		$[57] = t20;
+	} else t20 = $[57];
+	let t21;
+	if ($[58] !== location || $[59] !== navigate || $[60] !== t20) {
+		t21 = /* @__PURE__ */ jsx(NavigationProvider, {
+			location,
+			navigate,
+			children: t20
+		});
+		$[58] = location;
+		$[59] = navigate;
+		$[60] = t20;
+		$[61] = t21;
+	} else t21 = $[61];
+	const content = t21;
+	let t22;
+	if ($[62] !== content || $[63] !== target.locale) {
+		t22 = target.locale ? /* @__PURE__ */ jsx(ViewLocaleContext, {
 			value: target.locale,
 			children: content
 		}) : content;
-		$[56] = content;
-		$[57] = target.locale;
-		$[58] = t20;
-	} else t20 = $[58];
-	return t20;
+		$[62] = content;
+		$[63] = target.locale;
+		$[64] = t22;
+	} else t22 = $[64];
+	return t22;
 }
 function _temp2() {
 	return _temp;
@@ -539,19 +619,23 @@ var FrameErrorBoundary = class extends React.Component {
 			role: "alert",
 			"data-camox-renderer-error": true,
 			style: ERROR_STYLE,
-			children: [/* @__PURE__ */ jsx("p", {
-				style: {
-					margin: 0,
-					fontWeight: 600
-				},
-				children: "This page couldn’t render."
-			}), /* @__PURE__ */ jsx("p", {
-				style: {
-					margin: "8px 0 0",
-					fontFamily: "ui-monospace, monospace"
-				},
-				children: this.state.error
-			})]
+			children: [
+				/* @__PURE__ */ jsx(RemovesLeft, { nodes: this.props.left }),
+				/* @__PURE__ */ jsx("p", {
+					style: {
+						margin: 0,
+						fontWeight: 600
+					},
+					children: "This page couldn’t render."
+				}),
+				/* @__PURE__ */ jsx("p", {
+					style: {
+						margin: "8px 0 0",
+						fontFamily: "ui-monospace, monospace"
+					},
+					children: this.state.error
+				})
+			]
 		});
 	}
 };

package/dist/features/renderer/rendererHost.js

@@ -54,20 +54,16 @@ function createRendererHost({ studioCache, draftScope, queryClient, notify } = {
 	const shownScope = () => draftScope?.current() ?? LIVE_KEY_SCOPE;
 	const shown = (queryKey) => scopeOfKey(queryKey) === shownScope();
 	/** Whether a project room invalidation reaches the reads of the draft the renderer shows. */
-	const reaches = async (message, projectId) => {
-		if (message.draftId === null) return true;
-		if (!draftScope) return false;
-		return await draftScope.keyScopeOfDraft(message.draftId, projectId) === shownScope();
-	};
+	const reaches = (message) => message.draftId === null || !!draftScope && message.draftId === shownScope();
 	const relayChange = (change) => {
 		switch (change.type) {
 			case "received": {
 				const { message, projectId } = change;
-				reaches(message, projectId).then((reached) => reached && post({
+				if (reaches(message)) post({
 					type: "invalidate",
 					message,
 					projectId
-				}));
+				});
 				return;
 			}
 			case "wrote":

package/dist/features/routes/pageRuntime.d.ts

@@ -22,14 +22,11 @@ export type PageStructure = {
   recordStructuredData?: PageWithBlocks["recordStructuredData"];
 };
 /**
- * Why a member can't see the draft a URL names: it doesn't exist, it's someone else's
- * development draft, or it was published or deleted (ADR 0011). In dev mode, the caller's
- * own development draft doesn't exist until the dev server's first sync creates it.
+ * Why a member can't see the draft a URL names: it doesn't exist, it isn't open to them, or it
+ * was published or deleted (ADR 0011).
  */
 export type DraftNotice = {
   reason: "missing";
-} | {
-  reason: "noDevelopmentDraft";
 } | {
   reason: "forbidden";
 } | ({

package/dist/features/routes/pageRuntime.js

@@ -6,7 +6,7 @@ import { PAGE_IMAGE_SIZE, pageImageUrl } from "../og/pageImage.js";
 import { curatedLayoutContext } from "../../core/layoutContext.js";
 import { isArticle } from "../../core/structuredData.js";
 import { publishingDraft } from "../runtime/publishingDraft.js";
-import { DRAFT_ENDED_ERROR_CODE, DRAFT_HEADER, NO_DEVELOPMENT_DRAFT_ERROR, PUBLISHING_DRAFT_HEADER } from "@camox/api-contract/drafts";
+import { DRAFT_ENDED_ERROR_CODE, DRAFT_HEADER, PUBLISHING_DRAFT_HEADER } from "@camox/api-contract/drafts";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
 
@@ -83,7 +83,6 @@ function draftRefusalNotice(error, draftId) {
 		reason: "ended",
 		...data
 	};
-	if (code === NO_DEVELOPMENT_DRAFT_ERROR) return { reason: "noDevelopmentDraft" };
 	if (isNotFoundError(error) && data?.draftId === draftId) return { reason: "missing" };
 	if (code === "FORBIDDEN" || status === 403) return { reason: "forbidden" };
 	if (code === "UNAUTHORIZED" || status === 401) return null;

package/dist/features/runtime/RuntimeChrome.js

@@ -7,8 +7,8 @@ import { PreviewToolbar } from "../preview/components/PreviewToolbar.js";
 import { AgentSidebar } from "../studio/components/AgentSidebar.js";
 import { FollowAgentProvider } from "../studio/FollowAgentProvider.js";
 import { c } from "react/compiler-runtime";
-import { useSelector } from "@xstate/store-react";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { useSelector } from "@xstate/store-react";
 import studioCssUrl from "virtual:camox-studio-css";
 
 //#region src/features/runtime/RuntimeChrome.tsx

package/dist/features/runtime/loopbackFetch.d.ts

@@ -0,0 +1,8 @@
+//#region src/features/runtime/loopbackFetch.d.ts
+/**
+ * Browsers resolve any `*.localhost` name to loopback, but the Workers runtime asks the
+ * OS, which need not. Local dev servers (like the per-checkout API) use such names, so
+ * the dev worker reaches them on 127.0.0.1 instead.
+ */
+export declare function fetchLocalhostOnLoopback(fetch: typeof globalThis.fetch): typeof globalThis.fetch;
+//#endregion

package/dist/features/runtime/navigationTarget.js

@@ -9,8 +9,7 @@ function runtimePath(pathname, basePath) {
 }
 /**
 * Requests one of the runtime's JSON endpoints (`/_camox/data`, `/_camox/routes`) as the editor,
-* reading `draft` (null for Live) in `locale` (the default locale without it). Dev mode's runtime
-* always reads the development draft. A path the endpoint takes names its own locale by its
+* reading `draft` (null for Live) in `locale` (the default locale without it). A path the endpoint takes names its own locale by its
 * prefix; route discovery, which takes none, reads the locale the request names.
 */
 function fetchRuntimeJson(draftScope, endpoint, runtimeBasePath, params, draft, signal, locale) {

package/dist/features/runtime/pageApp.js

@@ -1,5 +1,5 @@
-import { useAuthState, useSignInRedirect } from "../../lib/auth.js";
 import { DraftScopeContext } from "../../lib/draft-scope.js";
+import { useAuthState, useSignInRedirect } from "../../lib/auth.js";
 import { useSignInShortcut } from "../provider/signInShortcut.js";
 import { PreviewDocumentContext } from "./PreviewDocumentContext.js";
 import { PreviewActivation } from "../preview/components/PreviewActivation.js";

package/dist/features/runtime/publicCache.d.ts

@@ -0,0 +1,21 @@
+//#region src/features/runtime/publicCache.d.ts
+/** Where a website's public renders are kept, and what they're kept under. */
+export interface PublicCache {
+  /** Opens Cloudflare's cache in the request's data center: `PUBLIC_CACHE_NAME`. */
+  cache: () => Promise<Cache>;
+  /** The project's Live cache key, which changes whenever Live does; null when unreadable. */
+  liveCacheKey: () => Promise<string | null>;
+  /** The website's build, so a release never serves pages naming the last release's assets. */
+  build: string;
+  waitUntil: (promise: Promise<unknown>) => void;
+}
+/** The named cache public renders are kept in. */
+export declare const PUBLIC_CACHE_NAME = "camox-public-renders";
+/** The project's Live cache key, as the API serves it from its edge cache. */
+export declare function readLiveCacheKey(apiUrl: string, projectUuid: string): Promise<string | null>;
+/**
+ * Answers a public request from the cache, or renders it and keeps the render when it may be
+ * shared. Without a Live cache key, it renders without the cache: nothing tells when Live changed.
+ */
+export declare function respondThroughPublicCache(request: Request, publicCache: PublicCache, render: () => Promise<Response | null>): Promise<Response | null>;
+//#endregion

package/dist/features/runtime/publishingDraft.d.ts

@@ -0,0 +1,4 @@
+//#region src/features/runtime/publishingDraft.d.ts
+/** Keeps the publishing draft a Worker's environment names, if it names one. */
+export declare function rememberPublishingDraft(env: unknown): void;
+//#endregion

package/dist/features/runtime/rendererClient.js

@@ -1,6 +1,6 @@
-import { getDraftReadClient } from "../../lib/api-client.js";
 import { DraftScopeContext, createDraftScope, followUrl } from "../../lib/draft-scope.js";
 import { StudioCacheContext, createStudioCache } from "../../lib/studio-reads.js";
+import { getDraftReadClient } from "../../lib/api-client.js";
 import { STUDIO_HANDLE_KEY } from "../renderer/protocol.js";
 import { CoreCamoxProvider } from "../provider/CoreCamoxProvider.js";
 import { readHydrationData } from "./hydrationData.js";

package/dist/features/runtime/runtime.d.ts

@@ -82,11 +82,6 @@ export interface RuntimeOptions {
     /** The built chunks each block module needs, by module path. `null` in dev. */
     chunks: Record<string, string[]> | null;
   };
-  /**
-   * Dev mode: every render reads the caller's development draft and ignores the URL's draft
-   * (ADR 0006).
-   */
-  developmentDraft?: boolean;
   pageClientEntryUrl?: string;
   studioClientEntryUrl?: string;
   /** The renderer frame's client entry, which renders the studio's pages (ADR 0023). */