@rebasepro/admin 0.12.0 → 0.12.1-canary.g35be8cb

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rebasepro/admin",
   "type": "module",
-  "version": "0.12.0",
+  "version": "0.12.1-canary.g35be8cb",
   "description": "Rebase CMS — content management views, forms, and routing",
   "funding": {
     "url": "https://github.com/sponsors/rebaseco"
@@ -18,7 +18,7 @@
   "types": "./dist/index.d.ts",
   "source": "src/index.ts",
   "engines": {
-    "node": ">=20"
+    "node": ">=22.22.0"
   },
   "keywords": [
     "rebase",
@@ -54,66 +54,64 @@
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
-    "@floating-ui/dom": "^1.7.6",
+    "@floating-ui/dom": "^1.8.0",
     "cmdk": "^1.1.1",
     "date-fns": "^4.4.0",
     "exceljs": "^4.4.0",
-    "fast-equals": "6.0.0",
-    "fractional-indexing": "3.2.0",
-    "fuse.js": "^7.4.2",
+    "fast-equals": "6.0.2",
+    "fractional-indexing": "4.0.0",
+    "fuse.js": "^7.5.0",
     "json5": "^2.2.3",
-    "markdown-it": "^14.2.0",
+    "markdown-it": "^14.3.0",
     "markdown-it-ins": "^4.0.0",
     "markdown-it-mark": "^4.0.0",
     "markdown-it-task-lists": "^2.1.1",
     "prism-react-renderer": "^2.4.1",
     "prosemirror-commands": "^1.7.1",
-    "prosemirror-dropcursor": "^1.8.2",
+    "prosemirror-dropcursor": "^1.8.3",
     "prosemirror-gapcursor": "^1.4.1",
     "prosemirror-history": "^1.5.0",
     "prosemirror-inputrules": "^1.5.1",
     "prosemirror-keymap": "^1.2.3",
-    "prosemirror-markdown": "^1.13.4",
-    "prosemirror-model": "^1.25.8",
+    "prosemirror-markdown": "^1.13.5",
+    "prosemirror-model": "^1.25.11",
     "prosemirror-schema-list": "^1.5.1",
     "prosemirror-state": "^1.4.4",
     "prosemirror-tables": "^1.8.5",
     "prosemirror-transform": "^1.12.0",
-    "prosemirror-view": "^1.41.9",
-    "react-dropzone": "^15.0.0",
+    "prosemirror-view": "^1.42.2",
+    "react-dropzone": "^19.1.1",
     "react-use-measure": "^2.1.7",
     "zod": "^4.4.3",
-    "@rebasepro/admin-types": "0.12.0",
-    "@rebasepro/app": "0.12.0",
-    "@rebasepro/common": "0.12.0",
-    "@rebasepro/forms": "0.12.0",
-    "@rebasepro/types": "0.12.0",
-    "@rebasepro/inference": "0.12.0",
-    "@rebasepro/ui": "0.12.0",
-    "@rebasepro/utils": "0.12.0"
+    "@rebasepro/admin-types": "0.12.1-canary.g35be8cb",
+    "@rebasepro/app": "0.12.1-canary.g35be8cb",
+    "@rebasepro/forms": "0.12.1-canary.g35be8cb",
+    "@rebasepro/inference": "0.12.1-canary.g35be8cb",
+    "@rebasepro/types": "0.12.1-canary.g35be8cb",
+    "@rebasepro/ui": "0.12.1-canary.g35be8cb",
+    "@rebasepro/utils": "0.12.1-canary.g35be8cb",
+    "@rebasepro/common": "0.12.1-canary.g35be8cb"
   },
   "peerDependencies": {
-    "react": ">=19.0.0",
-    "react-dom": ">=19.0.0",
-    "react-router": "^7.0.0",
-    "react-router-dom": "^7.0.0"
+    "react": ">=19.2.7",
+    "react-dom": ">=19.2.7",
+    "react-router": "^8.3.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/jest": "^30.0.0",
     "@types/markdown-it": "^14.1.2",
-    "@types/node": "^25.9.3",
+    "@types/node": "^26.1.2",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "@types/react-measure": "^2.0.12",
-    "@vitejs/plugin-react": "^6.0.2",
+    "@vitejs/plugin-react": "^6.0.4",
     "jest": "^30.4.2",
-    "react-router": "^7.17.0",
-    "react-router-dom": "^7.17.0",
-    "ts-jest": "^29.4.11",
+    "react-router": "^8.3.0",
+    "ts-jest": "^29.4.12",
     "typescript": "^6.0.3",
-    "vite": "^8.0.16"
+    "vite": "^8.1.5"
   },
   "files": [
     "dist",
@@ -131,13 +129,15 @@
   },
   "jest": {
     "transform": {
-      "^.+\\.[jt]sx?$": "ts-jest"
+      "^.+\\.tsx?$": "ts-jest",
+      "^.+\\.m?jsx?$": "<rootDir>/../../scripts/jest/react-router-esm-transform.cjs"
     },
     "testRegex": "(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$",
     "moduleFileExtensions": [
       "ts",
       "tsx",
       "js",
+      "mjs",
       "jsx",
       "json",
       "node"
@@ -146,9 +146,7 @@
     "testPathIgnorePatterns": [
       "/node_modules/"
     ],
-    "transformIgnorePatterns": [
-      "node_modules/(?!.*fractional-indexing)/"
-    ],
+    "transformIgnorePatterns": [],
     "setupFilesAfterEnv": [
       "<rootDir>/test/setupTests.ts"
     ],

package/src/collection_editor/ConfigControllerProvider.tsx

@@ -6,7 +6,7 @@ import { deepEqual as equal } from "fast-equals";
 import { CollectionsConfigController } from "./types/config_controller";
 import { useCustomizationController, useRebaseContext, useAuthController, useSnackbarController } from "@rebasepro/app";
 import { getTableName } from "@rebasepro/common";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { CollectionEditorController } from "./types/collection_editor_controller";
 import { CollectionInference } from "./types/collection_inference";
 import { CollectionGenerationCallback } from "./api/generateCollectionApi";

package/src/collection_editor/ui/collection_editor/RouterCollectionStudioView.tsx

@@ -10,7 +10,7 @@
  * (which has no react-router dependency).
  */
 import React from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useUrlController } from "../../_cms_internals";
 import { useSnackbarController } from "@rebasepro/app";
 import { CollectionStudioView, CollectionStudioViewProps } from "./CollectionStudioView";

package/src/collection_editor/ui/collection_editor/RouterCollectionsStudioView.tsx

@@ -9,7 +9,7 @@
  * (which has no react-router dependency).
  */
 import React from "react";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 import { useUrlController } from "../../_cms_internals";
 import { CollectionsStudioView, CollectionsStudioViewProps } from "./CollectionsStudioView";
 

package/src/collection_editor/useLocalCollectionsConfigController.tsx

@@ -4,6 +4,7 @@ import { getSubcollections } from "@rebasepro/common";
 
 import React, { useMemo, useRef } from "react";
 import type { AdminCollection } from "@rebasepro/admin-types";
+import { DEFAULT_API_PATH } from "@rebasepro/app";
 export function useLocalCollectionsConfigController(
     clientOrUrl: any,
     baseCollections: AdminCollection[] = [],
@@ -24,9 +25,13 @@ export function useLocalCollectionsConfigController(
         try {
             let token = optionsRef.current?.getAuthToken ? await optionsRef.current.getAuthToken() : null;
             let baseUrl = typeof clientOrUrl === "string" ? clientOrUrl : "";
+            // `/api` only by default — a backend configured with another
+            // `basePath` mounts the schema editor under that instead.
+            let apiPath = DEFAULT_API_PATH;
 
             if (typeof clientOrUrl === "object" && clientOrUrl !== null) {
                 baseUrl = clientOrUrl.baseUrl || baseUrl;
+                apiPath = clientOrUrl.apiPath || apiPath;
                 if (!token && clientOrUrl.resolveToken) {
                     token = await clientOrUrl.resolveToken();
                 }
@@ -37,7 +42,7 @@ export function useLocalCollectionsConfigController(
                 headers["Authorization"] = `Bearer ${token}`;
             }
 
-            const response = await fetch(`${baseUrl.replace(/\/$/, "")}/api/schema-editor${endpoint}`, {
+            const response = await fetch(`${baseUrl.replace(/\/$/, "")}${apiPath}/schema-editor${endpoint}`, {
                 method: "POST",
                 headers,
                 body: JSON.stringify(payload)

package/src/components/AdminModeSyncer.tsx

@@ -1,6 +1,6 @@
 import type { AppView } from "@rebasepro/admin-types";
 import React, { useEffect } from "react";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 ;
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 import { useAdminModeController } from "@rebasepro/app";

package/src/components/CollectionViewBinding/CollectionViewBinding.tsx

@@ -13,7 +13,7 @@ import {
     ViewMode
 } from "@rebasepro/admin-types";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams } from "react-router";
 
 import { deepEqual as equal } from "fast-equals"
 import { CollectionRowActions, CollectionTableBinding } from "../CollectionTableBinding";

package/src/components/CollectionViewBinding/CollectionViewStartActions.tsx

@@ -9,7 +9,7 @@ import { ClearFilterSortButton } from "../ClearFilterSortButton";
 import { FiltersDialog } from "./FiltersDialog";
 import { FilterPresetsButton } from "./FilterPresetsButton";
 import { toArray } from "@rebasepro/utils";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { useUrlController } from "../../hooks/navigation/contexts/UrlContext";
 import { useAdminContext } from "../../hooks/useAdminContext";
 import { withViewMode } from "../../util/view_mode";

package/src/components/CollectionViewBinding/SplitListView.tsx

@@ -11,7 +11,7 @@ import {
 } from "@rebasepro/ui";
 import { useLargeLayout, UnsavedChangesDialog, useNavigationBlocker } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../../hooks/navigation/contexts/CollectionRegistryContext";
-import { useNavigate, useLocation } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router";
 import { useUrlController } from "../../hooks/navigation/contexts/UrlContext";
 import { ErrorBoundary } from "@rebasepro/ui";
 import { withViewMode } from "../../util/view_mode";

package/src/components/DefaultAppBar.tsx

@@ -1,7 +1,7 @@
 
 import React from "react";
 
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useNavigate } from "react-router";
 import { RebaseLogo, LanguageToggle } from "@rebasepro/app";
 import { ErrorBoundary, iconSize } from "@rebasepro/ui";
 import {

package/src/components/DefaultDrawer.tsx

@@ -6,7 +6,7 @@ import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 import { useNavigationStateController } from "../hooks/navigation/contexts/NavigationStateContext";
 
 
-import { Link, useNavigate } from "react-router-dom";
+import { Link, useNavigate } from "react-router";
 import { AnalyticsEvent } from "@rebasepro/admin-types";
 import {
     Avatar,

package/src/components/DetailViewBinding.tsx

@@ -41,7 +41,7 @@ import {
 } from "@rebasepro/app";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { getValueInPath } from "@rebasepro/utils";
 import { getEntityTitlePropertyKeyForEntity, isUserSelectProperty, resolveTitleToString } from "../util/previews";
 import { getUserLabel, useResolvedUser } from "../hooks/useResolvedUsers";

package/src/components/DrawerNavigationItem.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { NavLink } from "react-router-dom";
+import { NavLink } from "react-router";
 import { cls, Tooltip } from "@rebasepro/ui";
 
 export function DrawerNavigationItem({

package/src/components/EditViewBinding.tsx

@@ -48,7 +48,7 @@ const EntityHistoryView = lazy(() => import("../components/history").then(m => (
 import { createFormexStub, getEntityFromCache } from "@rebasepro/app";
 import { usePermissions } from "@rebasepro/app";
 import { useUrlController } from "../hooks/navigation/contexts/UrlContext";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 
 import { MAIN_TAB_VALUE, JSON_TAB_VALUE, HISTORY_TAB_VALUE } from "../util/view_constants";
 export { MAIN_TAB_VALUE, JSON_TAB_VALUE, HISTORY_TAB_VALUE };

package/src/components/HomePage/FavouritesView.tsx

@@ -1,5 +1,5 @@
 import type { NavigationEntry } from "@rebasepro/admin-types";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 ;
 import { Chip, Collapse, StarIcon } from "@rebasepro/ui";
 import { useUserConfigurationPersistence } from "@rebasepro/app";

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -1,6 +1,6 @@
 
 import type { NavigationEntry, AdminCollection } from "@rebasepro/admin-types";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 ;
 import { IconButton, StarIcon, Tooltip } from "@rebasepro/ui";
 import { NavigationCard } from "./NavigationCard";

package/src/components/HomePage/SmallNavigationCard.tsx

@@ -1,6 +1,6 @@
 import { cardClickableMixin, cardMixin, cls, Typography } from "@rebasepro/ui";
 
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 
 export type SmallNavigationCardProps = {
     name: string,

package/src/components/RebaseLayout.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Outlet } from "react-router-dom";
+import { Outlet } from "react-router";
 import {
     useAdminModeController,
     useComponentOverride,

package/src/components/RebaseRouteDefs.tsx

@@ -1,5 +1,5 @@
 import React, { lazy, Suspense, useMemo } from "react";
-import { Route } from "react-router-dom";
+import { Route } from "react-router";
 import {
     useRebaseRegistry,
     RebaseRoutes,

package/src/components/SidePanelBinding.tsx

@@ -8,7 +8,7 @@ import { IconButton, Maximize2Icon, XIcon } from "@rebasepro/ui";
 import { EditViewBinding } from "./EditViewBinding";
 import { DetailViewBinding } from "./DetailViewBinding";
 import { useSideDialogContext } from "./SideDialogs";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { saveEntityToMemoryCache, useComponentOverride } from "@rebasepro/app";
 import { useCollectionRegistryController } from "../hooks/navigation/contexts/CollectionRegistryContext";
 import { useSidePanel } from "../hooks/useSidePanel";

package/src/components/UserSelector.tsx

@@ -21,7 +21,7 @@ import * as React from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Command as CommandPrimitive } from "cmdk";
 import { User } from "@rebasepro/types";
-import { useRebaseClient, useAuthController, UserDisplay } from "@rebasepro/app";
+import { apiBaseOf, useRebaseClient, useAuthController, UserDisplay } from "@rebasepro/app";
 import { EmptyValue } from "../preview";
 
 interface UserSelectorItem {
@@ -37,7 +37,7 @@ const DEFAULT_PAGE_SIZE = 10;
  * Local hook to fetch users from the collection REST API with search and pagination.
  */
 function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE }: { pageSize?: number } = {}) {
-    const client = useRebaseClient<{ baseUrl?: string }>();
+    const client = useRebaseClient<{ baseUrl?: string, apiPath?: string }>();
     const { getAuthToken } = useAuthController();
 
     const [items, setItems] = useState<UserSelectorItem[]>([]);
@@ -48,7 +48,8 @@ function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE }: { pageSize?: number }
     const userCacheRef = useRef<Map<string, User>>(new Map());
 
     const fetchUsers = useCallback(async (searchStr: string, offset: number, append: boolean) => {
-        if (!client?.baseUrl) return;
+        const apiBase = apiBaseOf(client);
+        if (!apiBase) return;
         setIsLoading(true);
         try {
             const token = await getAuthToken?.();
@@ -57,7 +58,7 @@ function useUserSelector({ pageSize = DEFAULT_PAGE_SIZE }: { pageSize?: number }
                 offset: String(offset)
             });
             if (searchStr) params.set("search", searchStr);
-            const response = await fetch(`${client.baseUrl}/api/users?${params}`, {
+            const response = await fetch(`${apiBase}/users?${params}`, {
                 headers: token ? { Authorization: `Bearer ${token}` } : {}
             });
             if (!response.ok) throw new Error("Failed to fetch users");
@@ -86,7 +87,7 @@ user };
         } finally {
             setIsLoading(false);
         }
-    }, [client?.baseUrl, getAuthToken, pageSize]);
+    }, [client?.baseUrl, client?.apiPath, getAuthToken, pageSize]);
 
     useEffect(() => {
         offsetRef.current = 0;

package/src/components/common/default_entity_actions.tsx

@@ -21,6 +21,7 @@ import {
 import type { User } from "@rebasepro/types";
 import type { EntityAction, UserCreationResult } from "@rebasepro/admin-types";
 import {
+    apiBaseOf,
     useAuthController,
     useRebaseClient,
     useSnackbarController,
@@ -246,7 +247,7 @@ export function ResetPasswordActionDialog({
     open: boolean;
     onClose: () => void;
 }) {
-    const client = useRebaseClient<{ baseUrl?: string }>();
+    const client = useRebaseClient<{ baseUrl?: string, apiPath?: string }>();
     const { getAuthToken } = useAuthController();
     const snackbarController = useSnackbarController();
     const { t } = useTranslation();
@@ -270,9 +271,9 @@ export function ResetPasswordActionDialog({
         setLoading(true);
         setError(null);
         try {
-            const baseUrl = client?.baseUrl || "";
+            const apiBase = apiBaseOf(client) ?? "";
             const token = await getAuthToken?.();
-            const response = await fetch(`${baseUrl}/api/admin/users/${user.uid}/reset-password`, {
+            const response = await fetch(`${apiBase}/admin/users/${user.uid}/reset-password`, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",

package/src/components/history/LastEditedByIndicator.tsx

@@ -1,7 +1,7 @@
 
 import React, { useEffect, useState, useCallback } from "react";
 ;
-import { useApiConfig } from "@rebasepro/app";
+import { useApiBase, useApiConfig } from "@rebasepro/app";
 import { useAuthController } from "@rebasepro/app";
 import { HistoryEntryData } from "../../hooks";
 import type { AdminCollection } from "@rebasepro/admin-types";
@@ -35,6 +35,7 @@ export function LastEditedByIndicator({
     collection: AdminCollection;
 }) {
     const apiConfig = useApiConfig();
+    const apiBase = useApiBase();
     const authController = useAuthController();
     const [latestEntry, setLatestEntry] = useState<HistoryEntryData | undefined>();
 
@@ -46,7 +47,7 @@ export function LastEditedByIndicator({
             const headers: Record<string, string> = {};
             if (token) headers["Authorization"] = `Bearer ${token}`;
 
-            const url = `${apiConfig.apiUrl}/api/data/${collection.slug}/${entityId}/history?limit=1&offset=0`;
+            const url = `${apiBase}/data/${collection.slug}/${entityId}/history?limit=1&offset=0`;
             const response = await fetch(url, { headers });
 
             if (response.ok) {
@@ -59,7 +60,7 @@ export function LastEditedByIndicator({
             // Silently fail — this is a non-critical UI indicator
             console.debug("Failed to fetch latest history entry:", error);
         }
-    }, [apiConfig, entityId, collection.slug]);
+    }, [apiConfig, apiBase, entityId, collection.slug]);
 
     useEffect(() => {
         fetchLatest();

package/src/hooks/navigation/useBuildUrlController.tsx

@@ -2,7 +2,7 @@ import type { UrlController, NavigateOptions } from "@rebasepro/admin-types";
 import { useCallback, useMemo } from "react";
 import { removeInitialAndTrailingSlashes, resolveCollectionPathIds } from "@rebasepro/app";
 import { CollectionRegistryController } from "@rebasepro/types";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 
 export function useBuildUrlController(props: {
     basePath: string,

package/src/hooks/useBuildSideDialogsController.tsx

@@ -1,9 +1,9 @@
 import type { SideDialogPanelProps, SideDialogsController } from "../hooks/useSideDialogsController";
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { useLocation, useNavigate } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router";
 ;
 import { deepEqual as equal } from "fast-equals"
-import { Location } from "react-router-dom";
+import { Location } from "react-router";
 
 interface SideDialogLocationState {
     base_location?: Location;

package/src/hooks/useBuildSidePanel.tsx

@@ -4,7 +4,7 @@ import type { CustomizationController, SidePanelBindingProps, SideDialogPanelPro
 import { useCallback, useEffect, useRef, useMemo } from "react";
 import { CollectionRegistryController } from "@rebasepro/types";
 import { AuthController } from "@rebasepro/admin-types";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { NavigationViewInternal } from "@rebasepro/app";
 import { getNavigationEntriesFromPath, removeInitialAndTrailingSlashes, removeTrailingSlash, resolveDefaultSelectedView } from "@rebasepro/app";
 import { resolvedSelectedEntityView } from "../util/resolutions";

package/src/hooks/useHistory.ts

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState, useMemo } from "react";
-import { useApiConfig } from "@rebasepro/app";
+import { useApiBase, useApiConfig } from "@rebasepro/app";
 import type { EntityHistoryEntry } from "@rebasepro/types";
 
 /**
@@ -31,6 +31,7 @@ export function useHistory(params: {
 }): UseEntityHistoryResult {
     const { slug, entityId, enabled = true, pageSize = 10 } = params;
     const apiConfig = useApiConfig();
+    const apiBase = useApiBase();
 
     const [entries, setEntries] = useState<HistoryEntryData[]>([]);
     const [total, setTotal] = useState(0);
@@ -59,7 +60,7 @@ export function useHistory(params: {
             };
             if (token) headers["Authorization"] = `Bearer ${token}`;
 
-            const url = `${apiConfig.apiUrl}/api/data/${slug}/${entityId}/history?limit=${pageSize}&offset=${currentOffset}`;
+            const url = `${apiBase}/data/${slug}/${entityId}/history?limit=${pageSize}&offset=${currentOffset}`;
             const response = await fetch(url, { headers,
 signal });
 
@@ -90,7 +91,7 @@ signal });
         } finally {
             setIsLoading(false);
         }
-    }, [apiConfig, slug, entityId, enabled, pageSize]);
+    }, [apiConfig, apiBase, slug, entityId, enabled, pageSize]);
 
     // Single unified effect: reset state when entity changes, fetch when offset changes.
     // Uses AbortController to cancel stale requests on entity change or unmount.
@@ -136,7 +137,7 @@ signal });
         };
         if (token) headers["Authorization"] = `Bearer ${token}`;
 
-        const url = `${apiConfig.apiUrl}/api/data/${slug}/${entityId}/history/${historyId}/revert`;
+        const url = `${apiBase}/data/${slug}/${entityId}/history/${historyId}/revert`;
         const response = await fetch(url, { method: "POST",
 headers });
 
@@ -154,7 +155,7 @@ headers });
 
         // Return the reverted entity data so callers can update the form
         return result.data as Record<string, unknown>;
-    }, [apiConfig, slug, entityId]);
+    }, [apiConfig, apiBase, slug, entityId]);
 
     return useMemo(() => ({
         entries,

package/src/hooks/useResolvedUsers.ts

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import type { User } from "@rebasepro/types";
-import { useAuthController, useRebaseClient } from "@rebasepro/app";
+import { apiBaseOf, useAuthController, useRebaseClient } from "@rebasepro/app";
 
 /**
  * Resolves the auth users behind `userSelect` values.
@@ -31,12 +31,12 @@ queue: new Set() };
     return cache;
 }
 
-async function fetchUsers(baseUrl: string, ids: string[], token: string | undefined): Promise<Map<string, User | null>> {
+async function fetchUsers(apiBase: string, ids: string[], token: string | undefined): Promise<Map<string, User | null>> {
     const resolved = new Map<string, User | null>();
     for (const id of ids) resolved.set(id, null);
 
     const params = new URLSearchParams({ ids: ids.join(",") });
-    const response = await fetch(`${baseUrl}/api/users?${params}`, {
+    const response = await fetch(`${apiBase}/users?${params}`, {
         headers: token ? { Authorization: `Bearer ${token}` } : {}
     });
     if (!response.ok) {
@@ -103,9 +103,12 @@ function requestUser(
  * when it cannot be resolved.
  */
 export function useResolvedUser(uid: string | undefined): User | null {
-    const client = useRebaseClient<{ baseUrl?: string }>();
+    const client = useRebaseClient<{ baseUrl?: string, apiPath?: string }>();
     const { getAuthToken } = useAuthController();
-    const baseUrl = client?.baseUrl;
+    /* The API prefix, not the bare origin: it keys the cache and is what a
+       request is built from, and a backend with a non-default `basePath`
+       serves neither at `/api`. */
+    const baseUrl = apiBaseOf(client);
 
     const [user, setUser] = useState<User | null>(() =>
         (baseUrl && uid) ? getCache(baseUrl).users.get(uid) ?? null : null);

package/src/routes/RebaseRoute.tsx

@@ -1,10 +1,10 @@
 
 import type { ViewMode, AdminCollection } from "@rebasepro/admin-types";
-import { useLocation } from "react-router-dom";
+import { useLocation } from "react-router";
 import { EditViewBinding } from "../components/EditViewBinding";
 import { DetailViewBinding } from "../components/DetailViewBinding";
 import { useCallback, useEffect, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { useNavigate } from "react-router";
 import { CollectionViewBinding } from "../components/CollectionViewBinding/CollectionViewBinding";
 import { NotFoundPage, useUserConfigurationPersistence, useComponentOverride, useNavigationBlocker } from "@rebasepro/app";
 import { resolveOpenEntityMode, resolveViewMode } from "../util/view_mode";