camox 0.10.0 → 0.10.1

package/dist/core/createBlock.js

@@ -20,6 +20,7 @@ import { Popover, PopoverContent, PopoverTrigger } from "@camox/ui/popover";
 import { toast } from "@camox/ui/toaster";
 import { Type as Type$1 } from "@sinclair/typebox";
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { useLocation } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import { generateKeyBetween } from "fractional-indexing";
 import * as React from "react";
@@ -35,9 +36,16 @@ const normalizeLinkValue = (value) => {
 	};
 	return value;
 };
-/** Resolve a LinkValue to an href string */
-const resolveLinkHref = (link, pages) => {
-	if (link.type === "page") return (pages?.find((p) => String(p.id) === link.pageId))?.fullPath ?? "#";
+/**
+* Resolve a LinkValue to an href string.
+*
+* Hash-only and empty hrefs are anchored to `currentPathname` so TanStack Router's
+* `<Link to>` builds the same `href` on SSR and client — bare `"#"` otherwise
+* resolves inconsistently across environments, causing hydration mismatches.
+*/
+const resolveLinkHref = (link, pages, currentPathname) => {
+	if (link.type === "page") return (pages?.find((p) => String(p.id) === link.pageId))?.fullPath ?? currentPathname;
+	if (!link.href || link.href.startsWith("#")) return `${currentPathname}${link.href ?? ""}`;
 	return link.href;
 };
 let hasShownEmbedLockToast = false;
@@ -506,7 +514,7 @@ function createBlock(options) {
 		return t28;
 	};
 	const Link = (t0) => {
-		const $ = c(36);
+		const $ = c(37);
 		const { name, children } = t0;
 		const blockContext = React.use(Context);
 		if (!blockContext) throw new Error("Link must be used within a Block Component");
@@ -554,7 +562,12 @@ function createBlock(options) {
 			$[8] = t6;
 		} else t6 = $[8];
 		const { data: pages } = useQuery(t6);
-		const resolvedHref = resolveLinkHref(fieldValue, pages);
+		let t7;
+		if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+			t7 = { select: _temp2 };
+			$[9] = t7;
+		} else t7 = $[9];
+		const resolvedHref = resolveLinkHref(fieldValue, pages, useLocation(t7));
 		const fieldId = getOverlayFieldId(blockId, repeaterContext, String(name));
 		const [isEditing, setIsEditing] = React.useState(false);
 		const [displayText, setDisplayText] = React.useState(fieldValue.text);
@@ -566,24 +579,24 @@ function createBlock(options) {
 			if (!isEditing) setDisplayText(fieldValue.text);
 		}, [fieldValue.text, isEditing]);
 		const isHoveredFromSidebar = useOverlayMessage(iframeWindow, isContentEditable, "CAMOX_HOVER_FIELD", "CAMOX_HOVER_FIELD_END", { fieldId });
-		let t7;
 		let t8;
-		if ($[9] !== isHoveredFromSidebar) {
-			t7 = () => {
+		let t9;
+		if ($[10] !== isHoveredFromSidebar) {
+			t8 = () => {
 				setIsHovered(isHoveredFromSidebar);
 			};
-			t8 = [isHoveredFromSidebar];
-			$[9] = isHoveredFromSidebar;
-			$[10] = t7;
+			t9 = [isHoveredFromSidebar];
+			$[10] = isHoveredFromSidebar;
 			$[11] = t8;
+			$[12] = t9;
 		} else {
-			t7 = $[10];
 			t8 = $[11];
+			t9 = $[12];
 		}
-		React.useEffect(t7, t8);
-		let t9;
-		if ($[12] !== blockId || $[13] !== name || $[14] !== repeaterContext || $[15] !== updateBlockContent || $[16] !== updateRepeatableContent) {
-			t9 = (newLinkValue) => {
+		React.useEffect(t8, t9);
+		let t10;
+		if ($[13] !== blockId || $[14] !== name || $[15] !== repeaterContext || $[16] !== updateBlockContent || $[17] !== updateRepeatableContent) {
+			t10 = (newLinkValue) => {
 				if (repeaterContext?.itemId != null) updateRepeatableContent.mutate({
 					id: repeaterContext.itemId,
 					content: { [name]: newLinkValue }
@@ -593,14 +606,14 @@ function createBlock(options) {
 					content: { [name]: newLinkValue }
 				});
 			};
-			$[12] = blockId;
-			$[13] = name;
-			$[14] = repeaterContext;
-			$[15] = updateBlockContent;
-			$[16] = updateRepeatableContent;
-			$[17] = t9;
-		} else t9 = $[17];
-		const saveLinkValue = t9;
+			$[13] = blockId;
+			$[14] = name;
+			$[15] = repeaterContext;
+			$[16] = updateBlockContent;
+			$[17] = updateRepeatableContent;
+			$[18] = t10;
+		} else t10 = $[18];
+		const saveLinkValue = t10;
 		const handleInput = (e) => {
 			const newText = e.target.textContent || "";
 			saveLinkValue({
@@ -608,9 +621,9 @@ function createBlock(options) {
 				text: newText
 			});
 		};
-		let t10;
-		if ($[18] !== blockId || $[19] !== name || $[20] !== repeaterContext) {
-			t10 = () => {
+		let t11;
+		if ($[19] !== blockId || $[20] !== name || $[21] !== repeaterContext) {
+			t11 = () => {
 				setIsEditing(true);
 				setIsEditorFocused(true);
 				if (repeaterContext?.itemId != null) previewStore.send({
@@ -627,32 +640,32 @@ function createBlock(options) {
 					fieldType: "Link"
 				});
 			};
-			$[18] = blockId;
-			$[19] = name;
-			$[20] = repeaterContext;
-			$[21] = t10;
-		} else t10 = $[21];
-		const handleFocus = t10;
-		let t11;
-		if ($[22] === Symbol.for("react.memo_cache_sentinel")) {
-			t11 = () => {
-				setIsEditing(false);
-				setIsEditorFocused(false);
-			};
+			$[19] = blockId;
+			$[20] = name;
+			$[21] = repeaterContext;
 			$[22] = t11;
 		} else t11 = $[22];
-		const handleBlur = t11;
+		const handleFocus = t11;
 		let t12;
 		if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
-			t12 = (e_0) => {
+			t12 = () => {
+				setIsEditing(false);
+				setIsEditorFocused(false);
+			};
+			$[23] = t12;
+		} else t12 = $[23];
+		const handleBlur = t12;
+		let t13;
+		if ($[24] === Symbol.for("react.memo_cache_sentinel")) {
+			t13 = (e_0) => {
 				e_0.stopPropagation();
 				previewStore.send({ type: "toggleContentSheet" });
 				setIsEditorFocused(false);
 				setIsEditing(false);
 			};
-			$[23] = t12;
-		} else t12 = $[23];
-		const handleEditLink = t12;
+			$[24] = t13;
+		} else t13 = $[24];
+		const handleEditLink = t13;
 		const linkData = {
 			text: displayText,
 			href: resolvedHref,
@@ -664,16 +677,16 @@ function createBlock(options) {
 			rel: fieldValue.newTab ? "noreferrer" : void 0,
 			children: fieldValue.text
 		}, linkData) });
-		let t13;
 		let t14;
-		if ($[24] === Symbol.for("react.memo_cache_sentinel")) {
-			t13 = () => setIsHovered(true);
-			t14 = () => setIsHovered(false);
-			$[24] = t13;
+		let t15;
+		if ($[25] === Symbol.for("react.memo_cache_sentinel")) {
+			t14 = () => setIsHovered(true);
+			t15 = () => setIsHovered(false);
 			$[25] = t14;
+			$[26] = t15;
 		} else {
-			t13 = $[24];
 			t14 = $[25];
+			t15 = $[26];
 		}
 		const linkProps = {
 			ref: elementRef,
@@ -686,56 +699,56 @@ function createBlock(options) {
 			"data-camox-focused": isFocused || void 0,
 			"data-camox-overlay-mode": mode === "layout" ? "layout" : void 0,
 			contentEditable: true,
-			onClick: _temp2,
+			onClick: _temp3,
 			onInput: handleInput,
 			onFocus: handleFocus,
 			onBlur: handleBlur,
-			onMouseEnter: t13,
-			onMouseLeave: t14,
-			onKeyDown: _temp3,
+			onMouseEnter: t14,
+			onMouseLeave: t15,
+			onKeyDown: _temp4,
 			spellCheck: false,
 			suppressContentEditableWarning: true
 		};
 		const T0 = Popover;
-		const t15 = children(linkProps, linkData);
-		let t16;
-		if ($[26] !== handleEditLink) {
-			t16 = /* @__PURE__ */ jsx("button", {
+		const t16 = children(linkProps, linkData);
+		let t17;
+		if ($[27] !== handleEditLink) {
+			t17 = /* @__PURE__ */ jsx("button", {
 				type: "button",
 				className: "hover:bg-accent flex items-center gap-1.5 rounded-md px-2 py-1 text-sm transition-colors",
-				onMouseDown: _temp4,
+				onMouseDown: _temp5,
 				onClick: handleEditLink,
 				children: "Edit link"
 			});
-			$[26] = handleEditLink;
-			$[27] = t16;
-		} else t16 = $[27];
-		let t17;
-		if ($[28] !== elementRef || $[29] !== t16) {
-			t17 = /* @__PURE__ */ jsx(PopoverContent, {
+			$[27] = handleEditLink;
+			$[28] = t17;
+		} else t17 = $[28];
+		let t18;
+		if ($[29] !== elementRef || $[30] !== t17) {
+			t18 = /* @__PURE__ */ jsx(PopoverContent, {
 				className: "w-auto p-2",
 				initialFocus: false,
 				anchor: elementRef,
 				align: "end",
-				children: t16
+				children: t17
 			});
-			$[28] = elementRef;
-			$[29] = t16;
+			$[29] = elementRef;
 			$[30] = t17;
-		} else t17 = $[30];
-		let t18;
-		if ($[31] !== T0 || $[32] !== isEditorFocused || $[33] !== t15 || $[34] !== t17) {
-			t18 = /* @__PURE__ */ jsxs(T0, {
+			$[31] = t18;
+		} else t18 = $[31];
+		let t19;
+		if ($[32] !== T0 || $[33] !== isEditorFocused || $[34] !== t16 || $[35] !== t18) {
+			t19 = /* @__PURE__ */ jsxs(T0, {
 				open: isEditorFocused,
-				children: [t15, t17]
+				children: [t16, t18]
 			});
-			$[31] = T0;
-			$[32] = isEditorFocused;
-			$[33] = t15;
-			$[34] = t17;
+			$[32] = T0;
+			$[33] = isEditorFocused;
+			$[34] = t16;
 			$[35] = t18;
-		} else t18 = $[35];
-		return t18;
+			$[36] = t19;
+		} else t19 = $[36];
+		return t19;
 	};
 	const Image = (t0) => {
 		const $ = c(25);
@@ -1048,9 +1061,9 @@ function createBlock(options) {
 		const isContentEditable = useIsEditable(mode);
 		const { window: iframeWindow } = useFrame();
 		const [isHovered, setIsHovered] = React.useState(false);
-		const selection = useSelector(previewStore, _temp5);
-		const isPageContentSheetOpen = useSelector(previewStore, _temp6);
-		const isAddBlockSheetOpen = useSelector(previewStore, _temp7);
+		const selection = useSelector(previewStore, _temp6);
+		const isPageContentSheetOpen = useSelector(previewStore, _temp7);
+		const isAddBlockSheetOpen = useSelector(previewStore, _temp8);
 		const isAnySideSheetOpen = useIsPreviewSheetOpen();
 		const isBlockSelected = selection?.blockId === blockData._id;
 		const ref = React.useRef(null);
@@ -1123,7 +1136,7 @@ function createBlock(options) {
 			result = { ...blockData.content };
 			for (const key in result) {
 				const value = result[key];
-				if (Array.isArray(value) && value.length > 0 && value[0]?.content !== void 0) result[key] = value.map(_temp8);
+				if (Array.isArray(value) && value.length > 0 && value[0]?.content !== void 0) result[key] = value.map(_temp9);
 			}
 			$[15] = blockData.content;
 			$[16] = result;
@@ -1348,9 +1361,9 @@ function createBlock(options) {
 		const { blockId, mode, isHovered, setIsHovered } = ctx;
 		const isContentEditable = useIsEditable(mode);
 		const { window: iframeWindow } = useFrame();
-		const selection = useSelector(previewStore, _temp9);
-		const isAddBlockSheetOpen = useSelector(previewStore, _temp0);
-		const isPageContentSheetOpen = useSelector(previewStore, _temp1);
+		const selection = useSelector(previewStore, _temp0);
+		const isAddBlockSheetOpen = useSelector(previewStore, _temp1);
+		const isPageContentSheetOpen = useSelector(previewStore, _temp10);
 		const isBlockSelected = selection?.blockId === blockId;
 		const t1 = String(blockId);
 		let t2;
@@ -1538,34 +1551,37 @@ function _temp() {
 		" to interact with the embed content"
 	] }));
 }
-function _temp2(e_1) {
+function _temp2(l) {
+	return l.pathname;
+}
+function _temp3(e_1) {
 	return e_1.preventDefault();
 }
-function _temp3(e_2) {
+function _temp4(e_2) {
 	if (e_2.key === "Escape") e_2.target.blur();
 }
-function _temp4(e_3) {
+function _temp5(e_3) {
 	return e_3.preventDefault();
 }
-function _temp5(state) {
+function _temp6(state) {
 	return state.context.selection;
 }
-function _temp6(state_0) {
+function _temp7(state_0) {
 	return state_0.context.isPageContentSheetOpen;
 }
-function _temp7(state_1) {
+function _temp8(state_1) {
 	return state_1.context.isAddBlockSheetOpen;
 }
-function _temp8(item) {
+function _temp9(item) {
 	return item.content;
 }
-function _temp9(state) {
+function _temp0(state) {
 	return state.context.selection;
 }
-function _temp0(state_0) {
+function _temp1(state_0) {
 	return state_0.context.isAddBlockSheetOpen;
 }
-function _temp1(state_1) {
+function _temp10(state_1) {
 	return state_1.context.isPageContentSheetOpen;
 }
 

package/dist/features/preview/CamoxPreview.js

@@ -19,6 +19,7 @@ import { PeekedBlock } from "./components/PeekedBlock.js";
 import { PreviewFrame, PreviewPanel } from "./components/PreviewPanel.js";
 import { c } from "react/compiler-runtime";
 import { keepPreviousData, useQuery, useQueryClient, useSuspenseQuery } from "@tanstack/react-query";
+import { useLocation, useNavigate } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -26,7 +27,6 @@ import { queryKeys } from "@camox/api-contract/query-keys";
 import { Button } from "@camox/ui/button";
 import { PanelContent, PanelHeader } from "@camox/ui/panel";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@camox/ui/tooltip";
-import { useLocation, useNavigate } from "@tanstack/react-router";
 import { Info } from "lucide-react";
 
 //#region src/features/preview/CamoxPreview.tsx

package/dist/features/preview/components/AddBlockSheet.js

@@ -8,13 +8,13 @@ import { trackClientEvent } from "../../../lib/analytics-client.js";
 import { usePreviewedPage } from "../CamoxPreview.js";
 import { c } from "react/compiler-runtime";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useLocation } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import { generateKeyBetween } from "fractional-indexing";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { queryKeys } from "@camox/api-contract/query-keys";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@camox/ui/tooltip";
-import { useLocation } from "@tanstack/react-router";
 import { InfoIcon } from "lucide-react";
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@camox/ui/command";
 

package/dist/features/preview/components/CreatePageModal.js

@@ -7,11 +7,11 @@ import { PageLocationFieldset } from "./PageLocationFieldset.js";
 import { Label } from "@camox/ui/label";
 import { toast } from "@camox/ui/toaster";
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { useNavigate } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import { useEffect } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
-import { useNavigate } from "@tanstack/react-router";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@camox/ui/dialog";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@camox/ui/select";
 import { Spinner } from "@camox/ui/spinner";

package/dist/features/preview/components/EditPageModal.js

@@ -11,12 +11,12 @@ import { c } from "react/compiler-runtime";
 import { Label } from "@camox/ui/label";
 import { toast } from "@camox/ui/toaster";
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { useNavigate } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@camox/ui/tooltip";
-import { useNavigate } from "@tanstack/react-router";
 import { Globe, Info } from "lucide-react";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@camox/ui/dialog";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@camox/ui/select";

package/dist/features/preview/components/PagePicker.js

@@ -5,11 +5,11 @@ import { cn, formatPathSegment } from "../../../lib/utils.js";
 import { Popover, PopoverContent, PopoverTrigger } from "@camox/ui/popover";
 import { toast } from "@camox/ui/toaster";
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { useLocation, useNavigate } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
-import { useLocation, useNavigate } from "@tanstack/react-router";
 import { Check, ChevronsUpDown, Pencil, Plus, Trash2 } from "lucide-react";
 import { Skeleton } from "@camox/ui/skeleton";
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList, CommandSeparator } from "@camox/ui/command";

package/dist/features/preview/components/useUpdateBlockPosition.js

@@ -2,10 +2,10 @@ import { previewStore } from "../previewStore.js";
 import { blockMutations } from "../../../lib/queries.js";
 import { c } from "react/compiler-runtime";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useLocation } from "@tanstack/react-router";
 import { useSelector } from "@xstate/store/react";
 import { generateKeyBetween } from "fractional-indexing";
 import { queryKeys } from "@camox/api-contract/query-keys";
-import { useLocation } from "@tanstack/react-router";
 
 //#region src/features/preview/components/useUpdateBlockPosition.ts
 function useUpdateBlockPosition() {

package/dist/features/provider/CamoxProvider.js

@@ -93,7 +93,7 @@ const UnauthenticatedCamoxProvider = (t0) => {
 	let t4;
 	if ($[5] !== signInRedirect) {
 		t3 = () => {
-			if (!import.meta.env.PROD) return;
+			if (import.meta.env.PROD) return;
 			const toastId = toast("Sign in to open Camox Studio", {
 				duration: Infinity,
 				action: {

package/dist/features/routes/pageRoute.js

@@ -2,11 +2,11 @@ import { seedBlockCaches } from "../../lib/normalized-data.js";
 import { CamoxPreview, PageContent } from "../preview/CamoxPreview.js";
 import { trackEvent } from "../../lib/analytics.js";
 import { c } from "react/compiler-runtime";
+import { notFound } from "@tanstack/react-router";
 import { jsx } from "react/jsx-runtime";
 import { queryKeys } from "@camox/api-contract/query-keys";
 import { createORPCClient } from "@orpc/client";
 import { RPCLink } from "@orpc/client/fetch";
-import { notFound } from "@tanstack/react-router";
 import { createMiddleware, createServerFn } from "@tanstack/react-start";
 import { getRequest } from "@tanstack/react-start/server";
 
@@ -70,11 +70,12 @@ function createPageLoader(apiUrl, projectSlug, environmentName) {
 			const [page, origin] = await Promise.all([context.queryClient.ensureQueryData({
 				queryKey: queryKeys.pages.getByPath(location.pathname),
 				queryFn: async () => {
-					const data = await serverApi.pages.getByPath({
+					const [data, pagesList] = await Promise.all([serverApi.pages.getByPath({
 						path: location.pathname,
 						projectSlug
-					});
+					}), serverApi.pages.listBySlug({ projectSlug }).catch(() => null)]);
 					seedBlockCaches(context.queryClient, data);
+					if (pagesList) context.queryClient.setQueryData(queryKeys.pages.list, pagesList);
 					return {
 						page: data.page,
 						layout: data.layout,

package/dist/features/studio/CamoxStudio.js

@@ -1,9 +1,9 @@
 import { useAuthState, useSignInRedirect } from "../../lib/auth.js";
 import { Navbar } from "./components/Navbar.js";
 import { c } from "react/compiler-runtime";
+import { Navigate, useLocation } from "@tanstack/react-router";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
-import { Navigate, useLocation } from "@tanstack/react-router";
 
 //#region src/features/studio/CamoxStudio.tsx
 const CamoxStudio = (t0) => {

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

@@ -10,10 +10,10 @@ import { UserButton } from "./UserButton.js";
 import { c } from "react/compiler-runtime";
 import { Kbd } from "@camox/ui/kbd";
 import { useQuery } from "@tanstack/react-query";
+import { Link, useLocation, useNavigate } from "@tanstack/react-router";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
-import { Link, useLocation, useNavigate } from "@tanstack/react-router";
 import { Database, Globe, SearchIcon } from "lucide-react";
 
 //#region src/features/studio/components/Navbar.tsx

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

@@ -2,10 +2,10 @@ import { AuthContext } from "../../../lib/auth.js";
 import { projectQueries } from "../../../lib/queries.js";
 import { c } from "react/compiler-runtime";
 import { useQuery } from "@tanstack/react-query";
+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 { Link } from "@tanstack/react-router";
 import { ChevronDown, Globe, Info, Settings, Users } from "lucide-react";
 import { DropdownMenu, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from "@camox/ui/dropdown-menu";
 import { Skeleton } from "@camox/ui/skeleton";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camox",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "bin": {
     "camox": "./bin/camox.mjs"
   },
@@ -97,9 +97,9 @@
     "react-dom": "^19.2.5",
     "react-og-preview": "^0.2.0",
     "shiki": "^4.0.2",
-    "@camox/api-contract": "0.10.0",
-    "@camox/cli": "0.10.0",
-    "@camox/ui": "0.10.0"
+    "@camox/cli": "0.10.1",
+    "@camox/api-contract": "0.10.1",
+    "@camox/ui": "0.10.1"
   },
   "devDependencies": {
     "@babel/core": "^7.29.0",