camox 0.26.0 → 0.28.0

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

@@ -8,6 +8,7 @@ import * as _$_tanstack_react_start0 from "@tanstack/react-start";
 declare function parseQuality(part: string): number;
 declare function prefersMarkdown(accept: string): boolean;
 declare const getOrigin: _$_tanstack_react_start0.OptionalFetcher<undefined, undefined, Promise<string>>;
+declare const getServerLoaderAuthCookieHeader: _$_tanstack_react_start0.OptionalFetcher<undefined, undefined, Promise<string>>;
 declare function createMarkdownMiddleware(apiUrl: string, projectSlug: string, environmentName?: string): _$_tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>;
 declare function createPageLoader(apiUrl: string, projectSlug: string, environmentName?: string): ({
   location,
@@ -36,6 +37,7 @@ declare function createPageLoader(apiUrl: string, projectSlug: string, environme
       layoutId: number;
       livePublishedCheckpointId: number | null;
       contentUpdatedAt: number;
+      nickname: string;
       metaTitle: string | null;
       metaDescription: string | null;
       aiSeoEnabled: boolean | null;
@@ -77,4 +79,4 @@ declare function createPageHead(camoxApp: CamoxApp): ({
 };
 declare const PageRouteComponent: () => _$react_jsx_runtime0.JSX.Element;
 //#endregion
-export { PageRouteComponent, createMarkdownMiddleware, createPageHead, createPageLoader, getOrigin, parseQuality, prefersMarkdown };
+export { PageRouteComponent, createMarkdownMiddleware, createPageHead, createPageLoader, getOrigin, getServerLoaderAuthCookieHeader, parseQuality, prefersMarkdown };

package/dist/features/routes/pageRoute.js

@@ -1,3 +1,4 @@
+import { getAuthCookieHeader, getServerAuthCookieHeader } from "../../lib/auth.js";
 import { seedBlockCaches } from "../../lib/normalized-data.js";
 import { CamoxPreview, PageContent } from "../preview/CamoxPreview.js";
 import { trackEvent } from "../../lib/telemetry.js";
@@ -25,18 +26,25 @@ function prefersMarkdown(accept) {
 	}
 	return markdownQ > 0 && markdownQ >= htmlQ;
 }
-function createServerApiClient(apiUrl, environmentName) {
+function createServerApiClient(apiUrl, environmentName, options) {
 	const headers = {};
 	if (environmentName) headers["x-environment-name"] = environmentName;
 	return createORPCClient(new RPCLink({
 		url: `${apiUrl}/rpc`,
-		headers
+		headers,
+		fetch: (request, init) => {
+			if (options?.authCookieHeader && request instanceof Request) request.headers.set("Better-Auth-Cookie", options.authCookieHeader);
+			return fetch(request, init);
+		}
 	}));
 }
 const getOrigin = createServerFn({ method: "GET" }).handler(async () => {
 	const request = getRequest();
 	return new URL(request.url).origin;
 });
+const getServerLoaderAuthCookieHeader = createServerFn({ method: "GET" }).handler(async () => {
+	return getServerAuthCookieHeader(getRequest().headers);
+});
 function createMarkdownMiddleware(apiUrl, projectSlug, environmentName) {
 	const api = createServerApiClient(apiUrl, environmentName);
 	return createMiddleware().server(async ({ next, request }) => {
@@ -65,20 +73,35 @@ function createMarkdownMiddleware(apiUrl, projectSlug, environmentName) {
 	});
 }
 function createPageLoader(apiUrl, projectSlug, environmentName) {
-	const serverApi = createServerApiClient(apiUrl, environmentName);
 	return async ({ location, context }) => {
 		try {
+			const authCookieHeader = typeof window !== "undefined" ? getAuthCookieHeader() : await getServerLoaderAuthCookieHeader();
+			const source = authCookieHeader ? "draft" : "live";
+			const serverApi = createServerApiClient(apiUrl, environmentName, { authCookieHeader });
 			const [page, origin] = await Promise.all([context.queryClient.ensureQueryData({
-				queryKey: queryKeys.pages.getByPath(location.pathname, "live"),
+				queryKey: queryKeys.pages.getByPath(location.pathname, source),
 				queryFn: async () => {
 					const [data, pagesList] = await Promise.all([serverApi.pages.getByPath({
 						path: location.pathname,
 						projectSlug,
-						source: "live"
+						source
 					}), serverApi.pages.listBySlug({ projectSlug }).catch(() => null)]);
-					seedBlockCaches(context.queryClient, data, "live");
-					seedBlockCaches(context.queryClient, data, "draft");
-					context.queryClient.setQueryData(queryKeys.pages.getByPath(location.pathname, "draft"), data);
+					seedBlockCaches(context.queryClient, data, source);
+					context.queryClient.setQueryData(queryKeys.pages.getByPath(location.pathname, source), {
+						page: data.page,
+						layout: data.layout,
+						projectName: data.projectName,
+						project: data.project
+					});
+					if (source === "live") {
+						seedBlockCaches(context.queryClient, data, "draft");
+						context.queryClient.setQueryData(queryKeys.pages.getByPath(location.pathname, "draft"), {
+							page: data.page,
+							layout: data.layout,
+							projectName: data.projectName,
+							project: data.project
+						});
+					}
 					if (pagesList) context.queryClient.setQueryData(queryKeys.pages.list, pagesList);
 					return {
 						page: data.page,
@@ -156,9 +179,9 @@ function createPageHead(camoxApp) {
 }
 const PageRouteComponent = () => {
 	const $ = c(2);
-	if ($[0] !== "70af43df8dd9dfc07ba240c4b5ef667ad871db6e9cbe22eb8e3647d7a89af86f") {
+	if ($[0] !== "c7f5f058711714d2b4ce2a6ee4fb3259e56b272fafb972520b82049c0f52d9df") {
 		for (let $i = 0; $i < 2; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "70af43df8dd9dfc07ba240c4b5ef667ad871db6e9cbe22eb8e3647d7a89af86f";
+		$[0] = "c7f5f058711714d2b4ce2a6ee4fb3259e56b272fafb972520b82049c0f52d9df";
 	}
 	let t0;
 	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
@@ -169,4 +192,4 @@ const PageRouteComponent = () => {
 };
 
 //#endregion
-export { PageRouteComponent, createMarkdownMiddleware, createPageHead, createPageLoader, getOrigin, parseQuality, prefersMarkdown };
+export { PageRouteComponent, createMarkdownMiddleware, createPageHead, createPageLoader, getOrigin, getServerLoaderAuthCookieHeader, parseQuality, prefersMarkdown };

package/dist/features/studio/components/EnvironmentMenu.js

@@ -6,9 +6,9 @@ import { toast } from "@camox/ui/toaster";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@camox/ui/alert-dialog";
 import { Button } from "@camox/ui/button";
 import { ChevronDown, Download, Upload } from "lucide-react";
-import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@camox/ui/alert-dialog";
 import { Badge } from "@camox/ui/badge";
 import { Separator } from "@camox/ui/separator";
 import { Spinner } from "@camox/ui/spinner";

package/dist/features/studio/components/ProjectMenu.js

@@ -6,8 +6,8 @@ import { Link } from "@tanstack/react-router";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
-import { ChevronDown, Globe, Info, Settings, Users } from "lucide-react";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@camox/ui/dropdown-menu";
+import { ChevronDown, Globe, Info, Settings, Users } from "lucide-react";
 import { Skeleton } from "@camox/ui/skeleton";
 
 //#region src/features/studio/components/ProjectMenu.tsx

package/dist/features/studio/components/UserButton.js

@@ -3,8 +3,8 @@ import { useApplyTheme } from "../useTheme.js";
 import { c } from "react/compiler-runtime";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
-import { Check, LogOut, Monitor, Moon, Settings, Sun, User } from "lucide-react";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger } from "@camox/ui/dropdown-menu";
+import { Check, LogOut, Monitor, Moon, Settings, Sun, User } from "lucide-react";
 import { Avatar, AvatarFallback, AvatarImage } from "@camox/ui/avatar";
 
 //#region src/features/studio/components/UserButton.tsx

package/dist/lib/auth.js

@@ -5,6 +5,26 @@ import { oneTimeTokenClient, organizationClient } from "better-auth/client/plugi
 import { createAuthClient } from "better-auth/react";
 
 //#region src/lib/auth.ts
+const SERVER_AUTH_COOKIE_NAME = "camox_auth_cookie";
+function writeServerAuthCookie(cookie) {
+	if (typeof document === "undefined") return;
+	const secure = window.location.protocol === "https:" ? "; Secure" : "";
+	if (!cookie) {
+		document.cookie = `${SERVER_AUTH_COOKIE_NAME}=; Path=/; SameSite=Lax; Max-Age=0${secure}`;
+		return;
+	}
+	document.cookie = `${SERVER_AUTH_COOKIE_NAME}=${encodeURIComponent(cookie)}; Path=/; SameSite=Lax; Max-Age=2592000${secure}`;
+}
+function getServerAuthCookieHeader(headers) {
+	const authCookie = (headers.get("Cookie") ?? headers.get("cookie") ?? "").split(";").map((part) => part.trim()).find((part) => part.startsWith(`${SERVER_AUTH_COOKIE_NAME}=`));
+	if (!authCookie) return "";
+	const value = authCookie.slice(18);
+	try {
+		return decodeURIComponent(value);
+	} catch {
+		return "";
+	}
+}
 function parseSetCookieHeader(header) {
 	const cookieMap = /* @__PURE__ */ new Map();
 	header.split(", ").forEach((cookie) => {
@@ -59,7 +79,9 @@ function getCookie(cookie) {
 */
 function getAuthCookieHeader() {
 	if (typeof window === "undefined") return "";
-	return getCookie(localStorage.getItem("better-auth_cookie") || "{}");
+	const cookie = getCookie(localStorage.getItem("better-auth_cookie") || "{}");
+	writeServerAuthCookie(cookie);
+	return cookie;
 }
 function crossDomainClient(opts = {}) {
 	let store = null;
@@ -101,6 +123,7 @@ function crossDomainClient(opts = {}) {
 					const prevCookie = storage.getItem(cookieName);
 					const toSetCookie = getSetCookie(setCookie || "", prevCookie ?? void 0);
 					await storage.setItem(cookieName, toSetCookie);
+					writeServerAuthCookie(getCookie(toSetCookie));
 					if (setCookie.includes(".session_token=")) {
 						const parsed = parseSetCookieHeader(setCookie);
 						let prevParsed = {};
@@ -114,7 +137,10 @@ function crossDomainClient(opts = {}) {
 				if (context.request.url.toString().includes("/get-session") && !opts?.disableCache) {
 					const data = context.data;
 					storage.setItem(localCacheName, JSON.stringify(data));
-					if (data === null) storage.setItem(cookieName, "{}");
+					if (data === null) {
+						storage.setItem(cookieName, "{}");
+						writeServerAuthCookie("");
+					} else writeServerAuthCookie(getCookie(storage.getItem(cookieName) || "{}"));
 				}
 			} },
 			async init(url, options) {
@@ -124,6 +150,7 @@ function crossDomainClient(opts = {}) {
 				};
 				options = options || {};
 				const cookie = getCookie(storage.getItem(cookieName) || "{}");
+				writeServerAuthCookie(cookie);
 				options.credentials = "omit";
 				options.headers = {
 					...options.headers,
@@ -131,6 +158,7 @@ function crossDomainClient(opts = {}) {
 				};
 				if (url.includes("/sign-out")) {
 					await storage.setItem(cookieName, "{}");
+					writeServerAuthCookie("");
 					store?.atoms.session?.set({
 						data: null,
 						error: null,
@@ -164,9 +192,9 @@ function createCamoxAuthClient(apiUrl) {
 */
 function useProcessOtt(authClient) {
 	const $ = c(5);
-	if ($[0] !== "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f") {
+	if ($[0] !== "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a") {
 		for (let $i = 0; $i < 5; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f";
+		$[0] = "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a";
 	}
 	const [ready, setReady] = React.useState(_temp);
 	let t0;
@@ -209,9 +237,9 @@ function _temp() {
 const AuthContext = React.createContext(null);
 function useAuthContext() {
 	const $ = c(1);
-	if ($[0] !== "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f") {
+	if ($[0] !== "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a") {
 		for (let $i = 0; $i < 1; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f";
+		$[0] = "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a";
 	}
 	const ctx = React.useContext(AuthContext);
 	if (!ctx) throw new Error("Missing CamoxProvider");
@@ -219,9 +247,9 @@ function useAuthContext() {
 }
 function useProjectSlug() {
 	const $ = c(1);
-	if ($[0] !== "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f") {
+	if ($[0] !== "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a") {
 		for (let $i = 0; $i < 1; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f";
+		$[0] = "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a";
 	}
 	return useAuthContext().projectSlug;
 }
@@ -235,18 +263,18 @@ function useAuthState() {
 }
 function useIsAuthenticated() {
 	const $ = c(1);
-	if ($[0] !== "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f") {
+	if ($[0] !== "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a") {
 		for (let $i = 0; $i < 1; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f";
+		$[0] = "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a";
 	}
 	const { isAuthenticated } = useAuthState();
 	return isAuthenticated;
 }
 function useSignInRedirect() {
 	const $ = c(3);
-	if ($[0] !== "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f") {
+	if ($[0] !== "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a") {
 		for (let $i = 0; $i < 3; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f";
+		$[0] = "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a";
 	}
 	const { authenticationUrl } = useAuthContext();
 	let t0;
@@ -267,9 +295,9 @@ function useSignInRedirect() {
 */
 function useAuthActions() {
 	const $ = c(5);
-	if ($[0] !== "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f") {
+	if ($[0] !== "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a") {
 		for (let $i = 0; $i < 5; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "e81e7f3a7847debd5cb6569770cedb214617cac7132fef9c515454bbdf62997f";
+		$[0] = "576010e4eb39afcae6f9e5e7fcb1b2de7558bf9039ed93e955c51d3fe8a38f1a";
 	}
 	const { authClient, authenticationUrl } = useAuthContext();
 	let t0;
@@ -321,4 +349,4 @@ function _temp2() {
 }
 
 //#endregion
-export { AuthContext, createCamoxAuthClient, getAuthCookieHeader, useAuthActions, useAuthContext, useAuthState, useIsAuthenticated, useProcessOtt, useProjectSlug, useSignInRedirect };
+export { AuthContext, createCamoxAuthClient, getAuthCookieHeader, getServerAuthCookieHeader, useAuthActions, useAuthContext, useAuthState, useIsAuthenticated, useProcessOtt, useProjectSlug, useSignInRedirect };

package/dist/lib/queries.js

@@ -145,6 +145,7 @@ const pageMutations = {
 	setMetaDescription: () => getOrpc().pages.setMetaDescription.mutationOptions(),
 	publish: () => getOrpc().pages.publish.mutationOptions(),
 	unpublish: () => getOrpc().pages.unpublish.mutationOptions(),
+	discardChanges: () => getOrpc().pages.discardChanges.mutationOptions(),
 	uploadCustomOgImage: () => ({ mutationFn: async ({ pageId, file }) => {
 		const formData = new FormData();
 		formData.append("file", file);

package/dist/lib/utils.js

@@ -59,16 +59,6 @@ function getActionShortcut(actions, actionId) {
 	const action = actions.find((a) => a.id === actionId);
 	return action?.shortcut ? formatShortcut(action.shortcut) : null;
 }
-/**
-* Converts a URL path segment into a human-readable title.
-* Replaces dashes and underscores with spaces and capitalizes each word.
-*
-* @example formatPathSegment("about-us") // "About Us"
-* @example formatPathSegment("studio_ui") // "Studio Ui"
-*/
-function formatPathSegment(segment) {
-	return segment.replace(/[-_]/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
-}
 
 //#endregion
-export { INPUT_BASE_STYLES, INPUT_FOCUS_STYLES, checkIfInputFocused, cn, formatPathSegment, formatShortcut, getActionShortcut };
+export { INPUT_BASE_STYLES, INPUT_FOCUS_STYLES, checkIfInputFocused, cn, formatShortcut, getActionShortcut };