camox 0.48.0 → 0.52.1

package/dist/features/vite/runtimeDev.js

@@ -22,6 +22,10 @@ const VIRTUAL_STUDIO_CLIENT = "virtual:camox/studio-client";
 const RESOLVED_VIRTUAL_STUDIO_CLIENT = "\0" + VIRTUAL_STUDIO_CLIENT;
 const VIRTUAL_STUDIO_CLIENT_URL = "virtual:camox/studio-client-url";
 const RESOLVED_VIRTUAL_STUDIO_CLIENT_URL = "\0" + VIRTUAL_STUDIO_CLIENT_URL;
+const VIRTUAL_RENDERER_CLIENT = "virtual:camox/renderer-client";
+const RESOLVED_VIRTUAL_RENDERER_CLIENT = "\0" + VIRTUAL_RENDERER_CLIENT;
+const VIRTUAL_RENDERER_CLIENT_URL = "virtual:camox/renderer-client-url";
+const RESOLVED_VIRTUAL_RENDERER_CLIENT_URL = "\0" + VIRTUAL_RENDERER_CLIENT_URL;
 const VIRTUAL_BLOCK_CHUNKS = "virtual:camox/block-chunks";
 const RESOLVED_VIRTUAL_BLOCK_CHUNKS = "\0" + VIRTUAL_BLOCK_CHUNKS;
 const VIRTUAL_APP_STYLESHEET_URL = "virtual:camox/app-stylesheet-url";
@@ -64,6 +68,7 @@ function resolveCamoxSourceImport(id) {
 		"camox/_internal/pageServer": resolve(sdkRoot, "src/features/runtime/pageServer.tsx"),
 		"camox/_internal/pageClient": resolve(sdkRoot, "src/features/runtime/pageClient.tsx"),
 		"camox/_internal/studioClient": resolve(sdkRoot, "src/features/runtime/studioClient.tsx"),
+		"camox/_internal/rendererClient": resolve(sdkRoot, "src/features/runtime/rendererClient.tsx"),
 		"camox/_internal/studioServer": resolve(sdkRoot, "src/features/runtime/studioServer.tsx"),
 		"camox/_internal/runtime": resolve(sdkRoot, "src/features/runtime/runtime.ts"),
 		"camox/worker": resolve(sdkRoot, "src/features/runtime/worker.ts")
@@ -167,6 +172,13 @@ import { camoxApp } from "virtual:camox/app";
 hydrateStudioWithApp(camoxApp);
 `;
 }
+function generateVirtualRendererClient() {
+	return `import { startRendererWithApp } from "camox/_internal/rendererClient";
+import { camoxApp } from "virtual:camox/app";
+
+startRendererWithApp(camoxApp);
+`;
+}
 function wrapViteDevId(id) {
 	return `/@id/${id.replace("\0", "__x00__")}`;
 }
@@ -176,6 +188,9 @@ function generateVirtualPageClientUrl() {
 function generateVirtualStudioClientUrl() {
 	return `export default ${JSON.stringify(wrapViteDevId(RESOLVED_VIRTUAL_STUDIO_CLIENT))};`;
 }
+function generateVirtualRendererClientUrl() {
+	return `export default ${JSON.stringify(wrapViteDevId(RESOLVED_VIRTUAL_RENDERER_CLIENT))};`;
+}
 function generateVirtualAppStylesheetUrl() {
 	return `import stylesheetUrl from "/src/styles.css?url";
 
@@ -183,7 +198,10 @@ export default stylesheetUrl;
 `;
 }
 function generateVirtualCamoxServer(runtimeBasePath) {
-	return `import { handleCamoxRequest as handleRuntimeRequest } from "camox/_internal/runtime";
+	return `import {
+  handleCamoxRequest as handleRuntimeRequest,
+  isPublicRequest as isPublicRuntimeRequest,
+} from "camox/_internal/runtime";
 import { blockModulePaths, camoxApp } from "virtual:camox/app";
 import blockChunks from "virtual:camox/block-chunks";
 import { camoxDocument } from "virtual:camox/document";
@@ -191,6 +209,7 @@ import appStylesheetUrl from "virtual:camox/app-stylesheet-url";
 import studioStylesheetUrl from "virtual:camox-studio-css";
 import pageClientEntryUrl from "virtual:camox/page-client-url";
 import studioClientEntryUrl from "virtual:camox/studio-client-url";
+import rendererClientEntryUrl from "virtual:camox/renderer-client-url";
 import { renderPage } from "virtual:camox/page-server";
 import { renderStudio } from "virtual:camox/studio-server";
 import devHtml from "virtual:camox/dev-html";
@@ -198,23 +217,41 @@ import devHtml from "virtual:camox/dev-html";
 export { devHtml };
 export const runtimeBasePath = ${JSON.stringify(normalizeRuntimeBasePath(runtimeBasePath))};
 
+const options = {
+  apiUrl: __CAMOX_API_URL__,
+  authenticationUrl: __CAMOX_AUTHENTICATION_URL__,
+  blockPreloads: { modulePaths: blockModulePaths, chunks: blockChunks },
+  pageClientEntryUrl,
+  studioClientEntryUrl,
+  rendererClientEntryUrl,
+  developmentDraft: __CAMOX_DEVELOPMENT_DRAFT__,
+  getCamoxApp: async () => camoxApp,
+  getDocument: async () => camoxDocument,
+  projectUuid: __CAMOX_PROJECT_ID__,
+  renderPage,
+  renderStudio,
+  runtimeBasePath: ${JSON.stringify(runtimeBasePath)},
+  stylesheetUrl: appStylesheetUrl,
+  studioStylesheetUrl,
+};
+
+export const publicCacheSource = {
+  apiUrl: __CAMOX_API_URL__,
+  projectUuid: __CAMOX_PROJECT_ID__,
+  build: __CAMOX_BUILD_ID__,
+};
+
 export async function handleCamoxRequest(request) {
-  return handleRuntimeRequest(request, {
-    apiUrl: __CAMOX_API_URL__,
-    authenticationUrl: __CAMOX_AUTHENTICATION_URL__,
-    blockPreloads: { modulePaths: blockModulePaths, chunks: blockChunks },
-    pageClientEntryUrl,
-    studioClientEntryUrl,
-    developmentDraft: __CAMOX_DEVELOPMENT_DRAFT__,
-    getCamoxApp: async () => camoxApp,
-    getDocument: async () => camoxDocument,
-    projectUuid: __CAMOX_PROJECT_ID__,
-    renderPage,
-    renderStudio,
-    runtimeBasePath: ${JSON.stringify(runtimeBasePath)},
-    stylesheetUrl: appStylesheetUrl,
-    studioStylesheetUrl,
-  });
+  return handleRuntimeRequest(request, options);
+}
+
+export function isPublicRequest(request) {
+  return isPublicRuntimeRequest(request, options);
+}
+
+// JSON, as \`definitions.sync\` receives it: what isn't JSON never reaches the API.
+export async function readDefinitionSet() {
+  return JSON.parse(JSON.stringify(await camoxApp.getDefinitionSet()));
 }
 `;
 }
@@ -232,6 +269,8 @@ function resolveRuntimeDevId(id, importer) {
 	if (id === VIRTUAL_PAGE_CLIENT_URL) return RESOLVED_VIRTUAL_PAGE_CLIENT_URL;
 	if (id === VIRTUAL_STUDIO_CLIENT) return RESOLVED_VIRTUAL_STUDIO_CLIENT;
 	if (id === VIRTUAL_STUDIO_CLIENT_URL) return RESOLVED_VIRTUAL_STUDIO_CLIENT_URL;
+	if (id === VIRTUAL_RENDERER_CLIENT) return RESOLVED_VIRTUAL_RENDERER_CLIENT;
+	if (id === VIRTUAL_RENDERER_CLIENT_URL) return RESOLVED_VIRTUAL_RENDERER_CLIENT_URL;
 	if (id === VIRTUAL_APP_STYLESHEET_URL) return RESOLVED_VIRTUAL_APP_STYLESHEET_URL;
 	if (id === VIRTUAL_BLOCK_CHUNKS) return RESOLVED_VIRTUAL_BLOCK_CHUNKS;
 	if (id === VIRTUAL_STUDIO_CSS) return RESOLVED_VIRTUAL_STUDIO_CSS;
@@ -249,6 +288,8 @@ function loadRuntimeDevModule(id, options = {}) {
 	if (id === RESOLVED_VIRTUAL_PAGE_CLIENT_URL) return generateVirtualPageClientUrl();
 	if (id === RESOLVED_VIRTUAL_STUDIO_CLIENT) return generateVirtualStudioClient();
 	if (id === RESOLVED_VIRTUAL_STUDIO_CLIENT_URL) return generateVirtualStudioClientUrl();
+	if (id === RESOLVED_VIRTUAL_RENDERER_CLIENT) return generateVirtualRendererClient();
+	if (id === RESOLVED_VIRTUAL_RENDERER_CLIENT_URL) return generateVirtualRendererClientUrl();
 	if (id === RESOLVED_VIRTUAL_APP_STYLESHEET_URL) return generateVirtualAppStylesheetUrl();
 	if (id === RESOLVED_VIRTUAL_STUDIO_CSS) {
 		const cssUrl = `/@fs/${resolve(sdkRoot, "dist/studio.css").replaceAll("\\", "/").replace(/^\/+/, "")}`;

package/dist/features/vite/staticAssetHeaders.js

@@ -0,0 +1,52 @@
+import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { join, relative } from "node:path";
+
+//#region src/features/vite/staticAssetHeaders.ts
+/** Where the client build puts the files it names by their content's hash. */
+const HASHED_DIRS = ["assets", "_chunks"];
+const IMMUTABLE = "public, max-age=31536000, immutable";
+/** Workers Static Assets reads at most this many rules. */
+const MAX_RULES = 100;
+/**
+* The `_headers` file Workers Static Assets serves the client build with. Files under
+* `/assets/` and `/_chunks/` are named by their content's hash, so browsers keep them for good;
+* the files there named otherwise, the entry chunks pages load by a fixed name and whatever the
+* app's public directory puts there, keep the default, which revalidates. The app's own
+* `_headers` comes first, as it wrote it.
+*/
+function staticAssetHeaders({ ownHeaders, unhashedFiles }) {
+	const rules = [...HASHED_DIRS.map((dir) => `/${dir}/*\n  Cache-Control: ${IMMUTABLE}`), ...[...unhashedFiles].sort().map((file) => `/${file}\n  ! Cache-Control`)];
+	const own = ownHeaders?.trimEnd();
+	const ownRules = own ? own.split("\n").filter((line) => /^\S/.test(line) && !line.startsWith("#")) : [];
+	if (ownRules.length + rules.length > MAX_RULES) throw new Error(`Camox: _headers would hold ${ownRules.length + rules.length} rules, past Workers Static Assets' ${MAX_RULES}. Move the public directory's files out of /assets/ and /_chunks/, or drop rules from public/_headers.`);
+	return [
+		...own ? [own] : [],
+		"# Camox: files named by their content's hash never change.",
+		...rules,
+		""
+	].join("\n");
+}
+/** The entry chunks of a bundle under the hashed directories, which pages load by name. */
+function unhashedEntries(bundle) {
+	return Object.values(bundle).flatMap((output) => output.type === "chunk" && output.isEntry ? [output.fileName] : []).filter(inHashedDir);
+}
+/** The files a public directory puts under the hashed directories, relative to it. */
+function publicFilesInHashedDirs(publicDir) {
+	if (!publicDir) return [];
+	return HASHED_DIRS.flatMap((dir) => filesUnder(join(publicDir, dir))).map((file) => relative(publicDir, file).replaceAll("\\", "/"));
+}
+/** The app's own `_headers`, if its public directory has one. */
+function readOwnHeaders(publicDir) {
+	const path = publicDir && join(publicDir, "_headers");
+	return path && existsSync(path) ? readFileSync(path, "utf-8") : void 0;
+}
+function inHashedDir(file) {
+	return HASHED_DIRS.some((dir) => file.startsWith(`${dir}/`));
+}
+function filesUnder(dir) {
+	if (!existsSync(dir)) return [];
+	return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => entry.isDirectory() ? filesUnder(join(dir, entry.name)) : [join(dir, entry.name)]);
+}
+
+//#endregion
+export { publicFilesInHashedDirs, readOwnHeaders, staticAssetHeaders, unhashedEntries };

package/dist/features/vite/vite.d.ts

@@ -23,7 +23,7 @@ export interface CamoxPluginOptions {
   _internal?: {
     /** URL of the Camox API backend, used for data fetching */
     apiUrl?: string;
-    /** URL of the Camox authentication backend (default: https://app.camox.dev) */
+    /** URL of the Camox authentication backend (default: https://app.camox.ai) */
     authenticationUrl?: string;
     /** Show Tanstack query devtools (default: false) */
     enableTanstackDevtools?: boolean;

package/dist/features/vite/vite.js

@@ -1,4 +1,5 @@
 import { createServerApiClient } from "../../lib/api-client-server.js";
+import { ASSET_PREFIX_GLOBAL } from "../runtime/assetPrefix.js";
 import { transformArtifactRuntime } from "./artifactRuntimeMinification.js";
 import { readAuthTokenForUrl } from "./auth.js";
 import { watchNewBlockFiles } from "./blockBoilerplate.js";
@@ -6,8 +7,10 @@ import { collectBlockChunks } from "./blockChunks.js";
 import { withoutExpectedCamoxLogs } from "./bundlerLogs.js";
 import { installDevAuthenticationMiddleware } from "./devAuthentication.js";
 import { installDevSignInLink } from "./devSignIn.js";
+import { HOSTED_BUILD_ENV, forbiddenImport, misnamedBlock, readHostedProject } from "./hostedChecks.js";
 import { generateIconTypes } from "./iconGeneration.js";
 import { generateLayoutFiles, watchLayoutFiles } from "./layoutGeneration.js";
+import { publicFilesInHashedDirs, readOwnHeaders, staticAssetHeaders, unhashedEntries } from "./staticAssetHeaders.js";
 import { buildClientThenWorker } from "./workerBuild.js";
 import { VIRTUAL_CAMOX_APP, syncDefinitions, syncDefinitionsToApi } from "./definitionsSync.js";
 import { publishSeededContent } from "./publishSeededContent.js";
@@ -15,9 +18,9 @@ import { cleanupGeneratedRouteFiles } from "./routeGeneration.js";
 import { RESOLVED_VIRTUAL_DEV_HTML, createRuntimeRegistryPlugin, loadRuntimeDevModule, resolveRuntimeDevId } from "./runtimeDev.js";
 import { projectIdSchema } from "@camox/api-contract/ids";
 import { DEVELOPMENT_DRAFT } from "@camox/api-contract/drafts";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, posix, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createServer } from "vite-plus";
 
@@ -33,10 +36,14 @@ const VIRTUAL_PAGE_CLIENT = "virtual:camox/page-client";
 const RESOLVED_VIRTUAL_PAGE_CLIENT_URL = "\0virtual:camox/page-client-url";
 const VIRTUAL_STUDIO_CLIENT = "virtual:camox/studio-client";
 const RESOLVED_VIRTUAL_STUDIO_CLIENT_URL = "\0virtual:camox/studio-client-url";
+const VIRTUAL_RENDERER_CLIENT = "virtual:camox/renderer-client";
+const RESOLVED_VIRTUAL_RENDERER_CLIENT_URL = "\0virtual:camox/renderer-client-url";
 const RESOLVED_VIRTUAL_BLOCK_CHUNKS = "\0virtual:camox/block-chunks";
-const PRODUCTION_API_URL = "https://api.camox.dev";
+/** A built file's URL in the server bundle: under the asset prefix, read when the bundle loads. */
+const serverAssetUrl = (file) => `(globalThis.${ASSET_PREFIX_GLOBAL} ?? "/") + ${JSON.stringify(file)}`;
+const PRODUCTION_API_URL = "https://api.camox.ai";
 /** Authentication URL to use for Camox authentication (production Camox Dashboard) */
-const DEFAULT_AUTHENTICATION_URL = "https://app.camox.dev";
+const DEFAULT_AUTHENTICATION_URL = "https://app.camox.ai";
 /** What Vite injects into HTML in dev, which the Worker can't ask Vite for itself. */
 async function getDevHtml(server) {
 	const html = await server.transformIndexHtml("/", "<html><head></head><body></body></html>");
@@ -173,6 +180,8 @@ function camox(options) {
 	let isRelease = false;
 	/** A release's build, without syncing to Live: what the upgrade job checks a project with. */
 	let isDryRun = false;
+	/** Set when the build checks a hosted project's code. */
+	let hostedProject;
 	let resolvedConfig;
 	let localAuth = null;
 	let blockChunks = {};
@@ -181,6 +190,10 @@ function camox(options) {
 		name: "camox",
 		enforce: "pre",
 		resolveId(id, importer) {
+			if (hostedProject) {
+				const forbidden = forbiddenImport(hostedProject, id, importer);
+				if (forbidden) this.error(forbidden);
+			}
 			const runtimeId = resolveRuntimeDevId(id, importer);
 			if (runtimeId) return runtimeId;
 			if (id === VIRTUAL_STUDIO_CSS) return RESOLVED_VIRTUAL_STUDIO_CSS;
@@ -198,7 +211,8 @@ function camox(options) {
 						fileName,
 						source: css
 					});
-					return `export default ${JSON.stringify(`/${fileName}`)};`;
+					if (this.environment.config.consumer === "client") return `export default new URL(/* @vite-ignore */ ${JSON.stringify(`../${fileName}`)}, import.meta.url).href;`;
+					return `export default ${serverAssetUrl(fileName)};`;
 				}
 				const cssUrl = `/@fs/${cssPath.replaceAll("\\", "/").replace(/^\/+/, "")}`;
 				return `export default ${JSON.stringify(cssUrl)};`;
@@ -208,8 +222,9 @@ function camox(options) {
 				const css = readFileSync(cssPath, "utf-8");
 				return `export default ${JSON.stringify(css)};`;
 			}
-			if (id === RESOLVED_VIRTUAL_PAGE_CLIENT_URL && isBuild) return "export default \"/_chunks/camox-page-client.mjs\";";
-			if (id === RESOLVED_VIRTUAL_STUDIO_CLIENT_URL && isBuild) return "export default \"/_chunks/camox-studio-client.mjs\";";
+			if (id === RESOLVED_VIRTUAL_PAGE_CLIENT_URL && isBuild) return `export default ${serverAssetUrl("_chunks/camox-page-client.mjs")};`;
+			if (id === RESOLVED_VIRTUAL_STUDIO_CLIENT_URL && isBuild) return `export default ${serverAssetUrl("_chunks/camox-studio-client.mjs")};`;
+			if (id === RESOLVED_VIRTUAL_RENDERER_CLIENT_URL && isBuild) return `export default ${serverAssetUrl("_chunks/camox-renderer-client.mjs")};`;
 			if (id === RESOLVED_VIRTUAL_BLOCK_CHUNKS && isBuild) return `export default ${JSON.stringify(blockChunks)};`;
 			if (id === "\0virtual:camox/dev-html") {
 				if (!devServer) return "export default null;";
@@ -221,11 +236,25 @@ function camox(options) {
 			});
 		},
 		transform(code, id) {
+			if (hostedProject) {
+				const misnamed = misnamedBlock(hostedProject, id, code);
+				if (misnamed) this.error(misnamed.message, misnamed.at);
+			}
 			return transformArtifactRuntime(code, id);
 		},
 		generateBundle(_outputOptions, bundle) {
 			if (this.environment.name !== "client") return;
 			blockChunks = collectBlockChunks(bundle, resolvedConfig.root);
+			if (!isBuild) return;
+			const { publicDir } = resolvedConfig;
+			this.emitFile({
+				type: "asset",
+				fileName: "_headers",
+				source: staticAssetHeaders({
+					ownHeaders: readOwnHeaders(publicDir),
+					unhashedFiles: [...unhashedEntries(bundle), ...publicFilesInHashedDirs(publicDir)]
+				})
+			});
 		},
 		async config(_config, env) {
 			const iconIds = await generateIconTypes(resolve(_config.root ?? process.cwd()), options.icons);
@@ -238,6 +267,14 @@ function camox(options) {
 				if (isBuild && !localAuth) throw new Error("Camox: not authenticated. Run `npx camox login` before building the site.");
 			}
 			return {
+				...isBuild && {
+					base: "./",
+					experimental: { renderBuiltUrl(filename, { ssr, hostType }) {
+						if (hostType === "css") return posix.relative("assets", filename);
+						if (!ssr) return { relative: true };
+						return { runtime: serverAssetUrl(filename) };
+					} }
+				},
 				build: { emitAssets: true },
 				..._config.builder?.buildApp ? {} : { builder: { buildApp: buildClientThenWorker } },
 				define: {
@@ -248,13 +285,15 @@ function camox(options) {
 					__CAMOX_DEVELOPMENT_DRAFT__: JSON.stringify(!isRelease),
 					__CAMOX_API_URL__: JSON.stringify(apiUrl),
 					__CAMOX_AUTHENTICATION_URL__: JSON.stringify(authenticationUrl),
-					__CAMOX_PROJECT_ID__: JSON.stringify(projectUuid)
+					__CAMOX_PROJECT_ID__: JSON.stringify(projectUuid),
+					__CAMOX_BUILD_ID__: JSON.stringify(randomUUID())
 				},
 				environments: { client: { build: { rollupOptions: {
 					onLog: withoutExpectedCamoxLogs(findClientOnLog(_config)),
 					input: {
 						"camox-page-client": VIRTUAL_PAGE_CLIENT,
-						"camox-studio-client": VIRTUAL_STUDIO_CLIENT
+						"camox-studio-client": VIRTUAL_STUDIO_CLIENT,
+						"camox-renderer-client": VIRTUAL_RENDERER_CLIENT
 					},
 					output: {
 						assetFileNames: "assets/[name]-[hash][extname]",
@@ -286,6 +325,7 @@ function camox(options) {
 		},
 		configResolved(config) {
 			resolvedConfig = config;
+			if (process.env["CAMOX_INTERNAL_HOSTED"] === "1") hostedProject = readHostedProject(config.root);
 			if (!config.plugins.some((plugin) => plugin.name.startsWith("vite-plugin-cloudflare"))) throw new Error("Camox: Camox apps run on Cloudflare Workers. Add `cloudflare()` from `@cloudflare/vite-plugin` to your Vite plugins, and point `main` in `wrangler.jsonc` at `camox/worker`.");
 			const routesDir = resolve(config.root, "src/routes");
 			writeRuntimeSidecar(config.root, {

package/dist/hooks/use-page-destinations.js

@@ -1,7 +1,7 @@
 import { useProjectUuid } from "../lib/auth.js";
-import { useCamoxApp } from "../features/provider/components/CamoxAppContext.js";
 import { reads, useReadQuery } from "../lib/studio-reads.js";
 import { linkablePages, useLinkablePages } from "../lib/link-pages.js";
+import { useRoutableLayouts } from "../lib/studio-definitions.js";
 import { getPageDestinations } from "../core/pageDestinations.js";
 import { c } from "react/compiler-runtime";
 
@@ -9,7 +9,7 @@ import { c } from "react/compiler-runtime";
 /** The pages of the locale viewed, which the studio navigates to. */
 function usePageDestinations() {
 	const $ = c(11);
-	const app = useCamoxApp();
+	const layouts = useRoutableLayouts();
 	const projectUuid = useProjectUuid();
 	let t0;
 	if ($[0] !== projectUuid) {
@@ -39,9 +39,9 @@ function usePageDestinations() {
 		$[7] = t4;
 	} else t4 = $[7];
 	let t5;
-	if ($[8] !== app || $[9] !== t4) {
-		t5 = getPageDestinations(t4, app.getLayouts());
-		$[8] = app;
+	if ($[8] !== layouts || $[9] !== t4) {
+		t5 = getPageDestinations(t4, layouts);
+		$[8] = layouts;
 		$[9] = t4;
 		$[10] = t5;
 	} else t5 = $[10];
@@ -53,7 +53,7 @@ function usePageDestinations() {
 */
 function useLinkDestinations() {
 	const $ = c(7);
-	const app = useCamoxApp();
+	const layouts = useRoutableLayouts();
 	let t0;
 	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
 		t0 = { fetchProject: true };
@@ -61,16 +61,16 @@ function useLinkDestinations() {
 	} else t0 = $[0];
 	const { pages, fallbackPages } = useLinkablePages(useProjectUuid(), t0);
 	let t1;
-	if ($[1] !== app || $[2] !== fallbackPages || $[3] !== pages) {
+	if ($[1] !== fallbackPages || $[2] !== layouts || $[3] !== pages) {
 		let t2;
 		if ($[5] !== pages) {
 			t2 = pages ?? [];
 			$[5] = pages;
 			$[6] = t2;
 		} else t2 = $[6];
-		t1 = getPageDestinations(linkablePages(t2, fallbackPages).map(_temp), app.getLayouts());
-		$[1] = app;
-		$[2] = fallbackPages;
+		t1 = getPageDestinations(linkablePages(t2, fallbackPages).map(_temp), layouts);
+		$[1] = fallbackPages;
+		$[2] = layouts;
 		$[3] = pages;
 		$[4] = t1;
 	} else t1 = $[4];

package/dist/lib/api-client-server.d.ts

@@ -1,4 +1,4 @@
-import { Router } from "@camox/api-contract";
+import { Router } from "@camox/api-contract/router";
 import { RouterClient } from "@orpc/server";
 //#region src/lib/api-client-server.d.ts
 export type ServerApiClient = RouterClient<Router>;

package/dist/lib/api-client.d.ts

@@ -1,5 +1,6 @@
+import "./locale-path.js";
 import "./draft-scope.js";
-import { Router } from "@camox/api-contract";
+import { Router } from "@camox/api-contract/router";
 import { RouterClient } from "@orpc/server";
 //#region src/lib/api-client.d.ts
 export type ApiClient = RouterClient<Router>;

package/dist/lib/draft-scope.d.ts

@@ -1,3 +1,4 @@
+import "./locale-path.js";
 import "../features/routes/pageRuntime.js";
 import "react";
 import { EndedDraft } from "@camox/api-contract/drafts";

package/dist/lib/locale-path.d.ts

@@ -1,14 +1,5 @@
+import { LocaleView } from "@camox/api-contract/locales";
 //#region src/lib/locale-path.d.ts
-/**
- * The URL names the locale: a non-default locale's paths sit under its prefix (`/de/preise`), the
- * default locale's have none. The studio's routes follow the same rule (`/de/camox/content`).
- * Pure, so the runtime and the browser share it.
- */
-/** A locale of a project, as `locales.list` returns it. */
-export type LocaleView = {
-  tag: string;
-  isDefault: boolean;
-};
 /**
  * Where a page sits in one locale it exists in: the locale's tag and the page's path there, under
  * the locale's prefix. The runtime finds them for `hreflang` links and the sitemap; the
@@ -19,4 +10,5 @@ export interface AlternatePath {
   /** The page's runtime path, with its locale's prefix and without the runtime base path. */
   path: string;
 }
-//#endregion
+//#endregion
+export type { LocaleView };

package/dist/lib/locale-path.js

@@ -1,10 +1,11 @@
 import { LOCALE_HEADER } from "@camox/api-contract/drafts";
+import { localePrefix, parseLocalePath } from "@camox/api-contract/locales";
 
 //#region src/lib/locale-path.ts
 /**
 * The URL names the locale: a non-default locale's paths sit under its prefix (`/de/preise`), the
 * default locale's have none. The studio's routes follow the same rule (`/de/camox/content`).
-* Pure, so the runtime and the browser share it.
+* Pure, so the runtime and the browser share it, and the API reads paths by the same rule.
 */
 /**
 * The default locale where nothing says its tag yet: before a render shows a locale, outside the
@@ -21,31 +22,6 @@ const UNNAMED_DEFAULT_LOCALE = {
 function localeHeaders(locale) {
 	return locale && !locale.isDefault ? { [LOCALE_HEADER]: locale.tag } : {};
 }
-/** A locale's URL prefix: its tag in lowercase. The default locale has none. */
-function localePrefix(locale) {
-	return locale.isDefault ? "" : `/${locale.tag.toLowerCase()}`;
-}
-/**
-* The locale a runtime path names, and the path after its prefix, without search or hash. A first
-* segment that isn't a non-default locale's prefix leaves the path the default locale's. A
-* locale's home is `/de`; `/de/` names it too.
-*/
-function parseLocalePath(pathname, locales) {
-	const path = pathname.replace(/[?#].*$/s, "") || "/";
-	const end = path.indexOf("/", 1);
-	const segment = end === -1 ? path.slice(1) : path.slice(1, end);
-	const named = locales.find((locale) => !locale.isDefault && localePrefix(locale) === `/${segment}`);
-	if (named) return {
-		locale: named,
-		path: end === -1 ? "/" : path.slice(end)
-	};
-	const fallback = locales.find((locale) => locale.isDefault);
-	if (!fallback) throw new Error("A project's locales include its default locale.");
-	return {
-		locale: fallback,
-		path
-	};
-}
 /** A locale-relative path under its locale's prefix, keeping its search and hash: `/` is `/de`. */
 function localizedPath(path, locale) {
 	const prefix = localePrefix(locale);
@@ -54,4 +30,4 @@ function localizedPath(path, locale) {
 }
 
 //#endregion
-export { UNNAMED_DEFAULT_LOCALE, localeHeaders, localePrefix, localizedPath, parseLocalePath };
+export { UNNAMED_DEFAULT_LOCALE, localeHeaders, localizedPath, parseLocalePath };

package/dist/lib/queries.js

@@ -25,6 +25,8 @@ async function sendFaviconChange(path, init) {
 	return res;
 }
 const projectMutations = {
+	update: () => getOrpc().projects.update.mutationOptions(),
+	updateAnalytics: () => getOrpc().projects.updateAnalytics.mutationOptions(),
 	updateSocialProfiles: () => getOrpc().projects.updateSocialProfiles.mutationOptions(),
 	uploadFavicon: () => ({ mutationFn: async ({ projectId, file }) => {
 		const formData = new FormData();
@@ -41,7 +43,11 @@ const projectMutations = {
 };
 const draftMutations = {
 	publish: () => getOrpc().drafts.publish.mutationOptions(),
-	discard: () => getOrpc().drafts.discard.mutationOptions()
+	discard: () => getOrpc().drafts.discard.mutationOptions(),
+	/** Requests the draft's overview again right away, once it failed. */
+	retryOverview: () => getOrpc().drafts.retryOverview.mutationOptions(),
+	/** Drops the draft's copy of an entity it conflicts on, to use Live's version instead. */
+	revertToLive: () => getOrpc().drafts.revertToLive.mutationOptions()
 };
 /** Adding and removing locales: content writes, so on Live they start a draft (ADR 0015). */
 const localeMutations = {

package/dist/lib/revisions.js

@@ -0,0 +1,20 @@
+import * as React from "react";
+
+//#region src/lib/revisions.ts
+function createRevisions() {
+	const listeners = /* @__PURE__ */ new Set();
+	return {
+		announce(revision) {
+			for (const listener of listeners) listener(revision);
+		},
+		subscribe(listener) {
+			listeners.add(listener);
+			return () => listeners.delete(listener);
+		}
+	};
+}
+/** The studio's announced revisions. The signed-in studio provides it. */
+const RevisionsContext = React.createContext(null);
+
+//#endregion
+export { RevisionsContext, createRevisions };

package/dist/lib/shortcuts.js

@@ -0,0 +1,29 @@
+import { PlatformLabel } from "../components/PlatformLabel.js";
+import { jsx } from "react/jsx-runtime";
+import { Kbd } from "@camox/ui/kbd";
+import { formatForDisplay } from "@tanstack/react-hotkeys";
+
+//#region src/lib/shortcuts.tsx
+/**
+* Formats a shortcut as a keyboard shortcut display component, labelled for the user's platform.
+*
+* @example
+* ```tsx
+* formatShortcut("Mod+E") // ⌘ E on Mac, Ctrl E elsewhere
+* formatShortcut("L")     // L
+* ```
+*/
+function formatShortcut(shortcut) {
+	if (!shortcut) return null;
+	const label = (platform) => formatForDisplay(shortcut, {
+		platform,
+		separatorToken: " "
+	});
+	return /* @__PURE__ */ jsx(Kbd, { children: /* @__PURE__ */ jsx(PlatformLabel, {
+		mac: label("mac"),
+		other: label("windows")
+	}) });
+}
+
+//#endregion
+export { formatShortcut };