camox 0.40.0 → 0.41.1

package/dist/features/provider/AuthenticatedCamoxProvider.js

@@ -51,7 +51,8 @@ function AuthenticatedCamoxProvider({ children }) {
 	return /* @__PURE__ */ jsxs(Fragment, { children: [
 		/* @__PURE__ */ jsx("link", {
 			rel: "stylesheet",
-			href: studioCssUrl
+			href: studioCssUrl,
+			"data-camox-studio": true
 		}),
 		children,
 		/* @__PURE__ */ jsx(Toaster, { theme: resolvedTheme }),

package/dist/features/provider/CoreCamoxProvider.js

@@ -1,6 +1,8 @@
 import { AuthContext, createCamoxAuthClient, useProcessOtt } from "../../lib/auth.js";
 import { initApiClient } from "../../lib/api-client.js";
+import { projectQueries } from "../../lib/queries.js";
 import { CamoxAppProvider } from "./components/CamoxAppContext.js";
+import { useQueryClient } from "@tanstack/react-query";
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
 
@@ -10,13 +12,19 @@ function isLocalhostPreview() {
 	const { hostname } = window.location;
 	return hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1";
 }
-function CoreCamoxProvider({ apiUrl, authenticationUrl, camoxApp, children, environmentName, projectSlug }) {
+function CoreCamoxProvider({ apiUrl, authenticationUrl, camoxApp, children, environmentName, projectSlug, initialAuthenticated = false, initialProject }) {
+	const queryClient = useQueryClient();
 	const authClient = React.useMemo(() => createCamoxAuthClient(apiUrl), [apiUrl]);
 	const initializedApiUrl = React.useRef(null);
 	if (initializedApiUrl.current !== apiUrl) {
 		initApiClient(apiUrl, environmentName);
 		initializedApiUrl.current = apiUrl;
 	}
+	const seededProject = React.useRef(void 0);
+	if (initialProject && seededProject.current !== initialProject) {
+		queryClient.setQueryData(projectQueries.getBySlug(projectSlug).queryKey, initialProject);
+		seededProject.current = initialProject;
+	}
 	useProcessOtt(authClient);
 	return /* @__PURE__ */ jsx(AuthContext.Provider, {
 		value: {
@@ -24,7 +32,8 @@ function CoreCamoxProvider({ apiUrl, authenticationUrl, camoxApp, children, envi
 			authenticationUrl,
 			apiUrl,
 			projectSlug,
-			environmentName
+			environmentName,
+			initialAuthenticated
 		},
 		children: /* @__PURE__ */ jsx(CamoxAppProvider, {
 			app: camoxApp,

package/dist/features/provider/LocalhostPreviewProvider.js

@@ -1,6 +1,7 @@
 import { actionsStore } from "./actionsStore.js";
 import { useSignInRedirect } from "../../lib/auth.js";
 import { useApplyTheme } from "../studio/useTheme.js";
+import { EDIT_MODE_SHORTCUT } from "../preview/previewConstants.js";
 import { PreviewPanel } from "../preview/components/PreviewPanel.js";
 import { useAdminShortcuts } from "./useAdminShortcuts.js";
 import { c } from "react/compiler-runtime";
@@ -13,9 +14,9 @@ import studioCssUrl from "virtual:camox-studio-css";
 //#region src/features/provider/LocalhostPreviewProvider.tsx
 function LocalhostPreviewProvider(t0) {
 	const $ = c(21);
-	if ($[0] !== "bd39c46de8381d98c4a04fb8c92df87704f578a9561f6fbfafaa182175dd58dd") {
+	if ($[0] !== "fddfba0cee29e4fb721206c13e16fbe407ae9aeb750c2a716d0ba1347b862953") {
 		for (let $i = 0; $i < 21; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "bd39c46de8381d98c4a04fb8c92df87704f578a9561f6fbfafaa182175dd58dd";
+		$[0] = "fddfba0cee29e4fb721206c13e16fbe407ae9aeb750c2a716d0ba1347b862953";
 	}
 	const { children } = t0;
 	const signInRedirect = useSignInRedirect();
@@ -33,10 +34,7 @@ function LocalhostPreviewProvider(t0) {
 				groupLabel: "Preview",
 				checkIfAvailable: _temp,
 				execute: () => setIsSignInDialogOpen(true),
-				shortcut: {
-					key: "Enter",
-					withMeta: true
-				}
+				shortcut: EDIT_MODE_SHORTCUT
 			}];
 			actionsStore.send({
 				type: "registerManyActions",
@@ -61,7 +59,8 @@ function LocalhostPreviewProvider(t0) {
 	if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
 		t3 = /* @__PURE__ */ jsx("link", {
 			rel: "stylesheet",
-			href: studioCssUrl
+			href: studioCssUrl,
+			"data-camox-studio": true
 		});
 		$[3] = t3;
 	} else t3 = $[3];

package/dist/features/provider/useAdminShortcuts.js

@@ -10,9 +10,9 @@ import { useSelector } from "@xstate/store-react";
 */
 function useAdminShortcuts() {
 	const $ = c(4);
-	if ($[0] !== "e5d3a4bbb325cbcce579826abdfc85cc9e0df725cd31dd3b6fd2c699d88a926c") {
+	if ($[0] !== "0255d4249a070c82da3a967d899d13f2ef37b37575822c7a0d008029181a2db4") {
 		for (let $i = 0; $i < 4; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e5d3a4bbb325cbcce579826abdfc85cc9e0df725cd31dd3b6fd2c699d88a926c";
+		$[0] = "0255d4249a070c82da3a967d899d13f2ef37b37575822c7a0d008029181a2db4";
 	}
 	const actions = useSelector(actionsStore, _temp);
 	let t0;
@@ -33,6 +33,7 @@ function useAdminShortcuts() {
 					if (shortcut.key === "Backspace") return;
 				}
 				event.preventDefault();
+				event.stopPropagation();
 				matchingAction.execute();
 			};
 			const handleMessage = (event_0) => {
@@ -42,10 +43,10 @@ function useAdminShortcuts() {
 					if (action_0) action_0.execute();
 				}
 			};
-			document.addEventListener("keydown", handleKeyDown);
+			document.addEventListener("keydown", handleKeyDown, true);
 			window.addEventListener("message", handleMessage);
 			return () => {
-				document.removeEventListener("keydown", handleKeyDown);
+				document.removeEventListener("keydown", handleKeyDown, true);
 				window.removeEventListener("message", handleMessage);
 			};
 		};

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

@@ -0,0 +1,10 @@
+import { QueryClient } from "@tanstack/react-query";
+import { Router } from "@camox/api-contract";
+import { RouterClient } from "@orpc/server";
+
+//#region src/features/routes/pageRuntime.d.ts
+declare function createServerApiClient(apiUrl: string, environmentName?: string, options?: {
+  authCookieHeader?: string;
+}): RouterClient<Router>;
+//#endregion
+export { createServerApiClient };

package/dist/features/routes/pageRuntime.js

@@ -194,15 +194,13 @@ function buildCamoxPageHead(camoxApp, loaderData) {
 	let title = pageMetaTitle;
 	if (page.layout) {
 		const layout = camoxApp.getLayoutById(page.layout.layoutId);
-		if (layout) {
-			title = layout._internal.buildMetaTitle({
-				pageMetaTitle,
-				projectName: page.projectName,
-				pageFullPath: page.page.fullPath
-			});
-			meta.push({ title });
-		}
+		if (layout) title = layout._internal.buildMetaTitle({
+			pageMetaTitle,
+			projectName: page.projectName,
+			pageFullPath: page.page.fullPath
+		});
 	}
+	meta.push({ title });
 	if (page.page.metaDescription) meta.push({
 		name: "description",
 		content: page.page.metaDescription
@@ -241,4 +239,4 @@ function buildCamoxPageHead(camoxApp, loaderData) {
 }
 
 //#endregion
-export { buildCamoxPageHead, createMarkdownResponse, createServerApiClient, isNotFoundError, loadCamoxPageForRequest };
+export { buildCamoxPageHead, createMarkdownResponse, createServerApiClient, isAuthSessionError, isNotFoundError, loadCamoxPageForRequest, seedBlockCaches };

package/dist/features/runtime/PreviewDocumentContext.js

@@ -0,0 +1,7 @@
+import { createContext } from "react";
+
+//#region src/features/runtime/PreviewDocumentContext.ts
+const PreviewDocumentContext = createContext(void 0);
+
+//#endregion
+export { PreviewDocumentContext };

package/dist/features/runtime/RuntimeChrome.js

@@ -0,0 +1,149 @@
+import { getApiClient } from "../../lib/api-client.js";
+import { SharedChromeContext } from "./SharedChromeContext.js";
+import { previewStore, selectPreviewSource } from "../preview/previewStore.js";
+import { Navbar } from "../studio/components/Navbar.js";
+import { PreviewToolbar } from "../preview/components/PreviewToolbar.js";
+import { c } from "react/compiler-runtime";
+import { useQuery } from "@tanstack/react-query";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useSelector } from "@xstate/store-react";
+import { queryKeys } from "@camox/api-contract/query-keys";
+import studioCssUrl from "virtual:camox-studio-css";
+
+//#region src/features/runtime/RuntimeChrome.tsx
+function RuntimeChrome(t0) {
+	const $ = c(33);
+	if ($[0] !== "b6bc64556f010bff957a9ab8a6f788b2f582426a19b86427f9d0314970d7a4dc") {
+		for (let $i = 0; $i < 33; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "b6bc64556f010bff957a9ab8a6f788b2f582426a19b86427f9d0314970d7a4dc";
+	}
+	const { input, children } = t0;
+	const preview = !input.routeKind;
+	const hidden = useSelector(previewStore, _temp);
+	const source = useSelector(previewStore, selectPreviewSource);
+	let t1;
+	if ($[1] !== input.pathname || $[2] !== source) {
+		t1 = queryKeys.pages.getByPath(input.pathname, source);
+		$[1] = input.pathname;
+		$[2] = source;
+		$[3] = t1;
+	} else t1 = $[3];
+	let t2;
+	if ($[4] !== input.pathname || $[5] !== input.projectSlug || $[6] !== source) {
+		t2 = () => getApiClient().pages.getStructure({
+			path: input.pathname,
+			projectSlug: input.projectSlug,
+			source
+		});
+		$[4] = input.pathname;
+		$[5] = input.projectSlug;
+		$[6] = source;
+		$[7] = t2;
+	} else t2 = $[7];
+	let t3;
+	if ($[8] !== t1 || $[9] !== t2) {
+		t3 = {
+			queryKey: t1,
+			queryFn: t2,
+			enabled: false
+		};
+		$[8] = t1;
+		$[9] = t2;
+		$[10] = t3;
+	} else t3 = $[10];
+	const { data: page } = useQuery(t3);
+	let t4;
+	if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
+		t4 = /* @__PURE__ */ jsx("link", {
+			rel: "stylesheet",
+			href: studioCssUrl,
+			"data-camox-studio": true
+		});
+		$[11] = t4;
+	} else t4 = $[11];
+	const t5 = preview ? "max-md:hidden" : void 0;
+	const t6 = preview && hidden;
+	let t7;
+	if ($[12] !== preview) {
+		t7 = /* @__PURE__ */ jsx(Navbar, { isPreview: preview });
+		$[12] = preview;
+		$[13] = t7;
+	} else t7 = $[13];
+	let t8;
+	if ($[14] !== t5 || $[15] !== t6 || $[16] !== t7) {
+		t8 = /* @__PURE__ */ jsx("div", {
+			className: t5,
+			hidden: t6,
+			children: t7
+		});
+		$[14] = t5;
+		$[15] = t6;
+		$[16] = t7;
+		$[17] = t8;
+	} else t8 = $[17];
+	let t9;
+	if ($[18] !== children) {
+		t9 = /* @__PURE__ */ jsx("div", {
+			className: "flex min-h-0 flex-1 flex-col overflow-auto",
+			children
+		});
+		$[18] = children;
+		$[19] = t9;
+	} else t9 = $[19];
+	const t10 = !preview;
+	const t11 = input.derived ? void 0 : "max-md:hidden";
+	const t12 = preview && !input.derived ? page?.page.status : void 0;
+	const t13 = !!page?.page.livePublishedCheckpointId;
+	let t14;
+	if ($[20] !== t12 || $[21] !== t13) {
+		t14 = /* @__PURE__ */ jsx(PreviewToolbar, {
+			pageStatus: t12,
+			hasLiveVersion: t13
+		});
+		$[20] = t12;
+		$[21] = t13;
+		$[22] = t14;
+	} else t14 = $[22];
+	let t15;
+	if ($[23] !== t10 || $[24] !== t11 || $[25] !== t14) {
+		t15 = /* @__PURE__ */ jsx("div", {
+			hidden: t10,
+			className: t11,
+			children: t14
+		});
+		$[23] = t10;
+		$[24] = t11;
+		$[25] = t14;
+		$[26] = t15;
+	} else t15 = $[26];
+	let t16;
+	if ($[27] !== t15 || $[28] !== t9) {
+		t16 = /* @__PURE__ */ jsxs("div", {
+			className: "relative flex min-h-0 flex-1 flex-col",
+			children: [t9, t15]
+		});
+		$[27] = t15;
+		$[28] = t9;
+		$[29] = t16;
+	} else t16 = $[29];
+	let t17;
+	if ($[30] !== t16 || $[31] !== t8) {
+		t17 = /* @__PURE__ */ jsxs(SharedChromeContext.Provider, {
+			value: true,
+			children: [t4, /* @__PURE__ */ jsxs("div", {
+				className: "bg-background flex h-screen flex-col overflow-hidden",
+				children: [t8, t16]
+			})]
+		});
+		$[30] = t16;
+		$[31] = t8;
+		$[32] = t17;
+	} else t17 = $[32];
+	return t17;
+}
+function _temp(state) {
+	return state.context.isToolbarHidden;
+}
+
+//#endregion
+export { RuntimeChrome };

package/dist/features/runtime/SharedChromeContext.js

@@ -0,0 +1,7 @@
+import { createContext } from "react";
+
+//#region src/features/runtime/SharedChromeContext.ts
+const SharedChromeContext = createContext(false);
+
+//#endregion
+export { SharedChromeContext };

package/dist/features/runtime/navigationRequest.js

@@ -0,0 +1,21 @@
+//#region src/features/runtime/navigationRequest.ts
+function createNavigationRequestTracker() {
+	let current;
+	return {
+		begin() {
+			current?.abort();
+			const controller = new AbortController();
+			current = controller;
+			return {
+				signal: controller.signal,
+				isCurrent: () => current === controller && !controller.signal.aborted
+			};
+		},
+		cancel() {
+			current?.abort();
+		}
+	};
+}
+
+//#endregion
+export { createNavigationRequestTracker };

package/dist/features/runtime/navigationTarget.js

@@ -0,0 +1,23 @@
+//#region src/features/runtime/navigationTarget.ts
+function runtimePath(pathname, basePath) {
+	const base = basePath.replace(/\/$/, "");
+	if (!base || pathname === base || pathname.startsWith(`${base}/`)) return pathname;
+	return `${base}${pathname.startsWith("/") ? pathname : `/${pathname}`}`;
+}
+function getNavigationTarget(to, currentHref, basePath) {
+	const url = new URL(to, currentHref);
+	const current = new URL(currentHref);
+	if (url.origin !== current.origin || !["http:", "https:"].includes(url.protocol)) return null;
+	const base = basePath.replace(/\/$/, "");
+	if (base && /^(https?:)?\/\//.test(to) && url.pathname !== base && !url.pathname.startsWith(`${base}/`)) return null;
+	const pathname = base && (url.pathname === base || url.pathname.startsWith(`${base}/`)) ? url.pathname.slice(base.length) || "/" : url.pathname;
+	if (pathname === "/_camox" || pathname.startsWith("/_camox/") || pathname === "/og" || pathname === "/sitemap.xml") return null;
+	url.pathname = runtimePath(pathname, base);
+	return {
+		url,
+		pathname
+	};
+}
+
+//#endregion
+export { getNavigationTarget, runtimePath };