convex-cms 0.0.9-alpha.5 → 0.0.9-alpha.6

package/admin/src/embed/index.tsx

@@ -4,32 +4,38 @@
  * Use this component to embed the CMS admin UI into your existing React app.
  * Provides a fully functional admin interface with router-agnostic navigation.
  *
+ * IMPORTANT: The CmsAdmin component must be rendered within a ConvexProvider.
+ * Your app should already have this if you're using Convex.
+ *
  * @example
  * ```tsx
- * import { CmsAdmin } from "@convex-cms/admin/embed";
+ * import { CmsAdmin } from "convex-cms/admin";
+ * import { api } from "./convex/_generated/api";
  *
  * function App() {
  *   return (
- *     <CmsAdmin
- *       convexUrl="https://your-deployment.convex.cloud"
- *       auth={{
- *         getUser: () => currentUser,
- *         getUserRole: (userId) => userRoles[userId] ?? null,
- *         onLogout: () => signOut(),
- *       }}
- *       config={{
- *         branding: { appName: "My CMS" },
- *         navigation: { showTaxonomies: false },
- *       }}
- *       basePath="/admin"
- *     />
+ *     <ConvexProvider client={convex}>
+ *       <CmsAdmin
+ *         api={api.admin}
+ *         auth={{
+ *           getUser: () => currentUser,
+ *           getUserRole: (userId) => userRoles[userId] ?? null,
+ *           onLogout: () => signOut(),
+ *         }}
+ *         config={{
+ *           branding: { appName: "My CMS" },
+ *           navigation: { showTaxonomies: false },
+ *         }}
+ *         basePath="/admin"
+ *       />
+ *     </ConvexProvider>
  *   );
  * }
  * ```
  */
 
-import { ConvexProvider, ConvexReactClient } from "convex/react";
-import { useMemo, type ReactNode } from "react";
+import { useConvex } from "convex/react";
+import { useMemo } from "react";
 import { SettingsConfigProvider } from "../contexts/SettingsConfigContext";
 import {
   AuthProvider,
@@ -73,36 +79,6 @@ function adaptAuthConfig(auth: CmsAdminAuthConfig): {
   };
 }
 
-function ConvexProviderWrapper({
-  convexUrl,
-  children,
-}: {
-  convexUrl: string;
-  children: ReactNode;
-}) {
-  const convex = useMemo(() => {
-    if (!convexUrl) return null;
-    return new ConvexReactClient(convexUrl);
-  }, [convexUrl]);
-
-  if (!convex) {
-    return (
-      <div className="flex min-h-full items-center justify-center bg-background p-6">
-        <div className="diff-modified max-w-lg space-y-4 rounded-lg border p-6 text-center">
-          <h2 className="text-xl font-semibold text-diff-modified">
-            Convex Configuration Required
-          </h2>
-          <p className="text-sm text-diff-modified-foreground">
-            Please provide a valid convexUrl prop to the CmsAdmin component.
-          </p>
-        </div>
-      </div>
-    );
-  }
-
-  return <ConvexProvider client={convex}>{children}</ConvexProvider>;
-}
-
 function EmbedRouter() {
   const { currentRoute } = useEmbedNavigation();
 
@@ -147,7 +123,6 @@ function EmbedRouter() {
 
 export function CmsAdmin({
   api,
-  convexUrl,
   config,
   auth,
   basePath = "/admin",
@@ -158,6 +133,7 @@ export function CmsAdmin({
   initialRoute?: EmbedRoute;
   onNavigate?: (path: string, params: Record<string, string>) => void;
 }) {
+  const convex = useConvex();
   const adminConfig = useMemo(() => resolveAdminConfig(config), [config]);
   const authConfig = useMemo(() => adaptAuthConfig(auth), [auth]);
   const settingsApi = useMemo(
@@ -165,31 +141,45 @@ export function CmsAdmin({
     [api]
   );
 
+  if (!convex) {
+    return (
+      <div className="flex min-h-full items-center justify-center bg-background p-6">
+        <div className="diff-modified max-w-lg space-y-4 rounded-lg border p-6 text-center">
+          <h2 className="text-xl font-semibold text-diff-modified">
+            ConvexProvider Required
+          </h2>
+          <p className="text-sm text-diff-modified-foreground">
+            CmsAdmin must be rendered within a ConvexProvider. Wrap your app or
+            this component with ConvexProvider.
+          </p>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className={className}>
       <ApiProvider api={api}>
         <ThemeProvider>
-          <ConvexProviderWrapper convexUrl={convexUrl}>
-            <SettingsConfigProvider baseConfig={adminConfig} api={settingsApi}>
-              <AuthProvider
-                getUser={authConfig.getUser}
-                getUserRole={authConfig.getUserRole}
-                onLogout={authConfig.onLogout}
+          <SettingsConfigProvider baseConfig={adminConfig} api={settingsApi}>
+            <AuthProvider
+              getUser={authConfig.getUser}
+              getUserRole={authConfig.getUserRole}
+              onLogout={authConfig.onLogout}
+            >
+              <EmbedNavigationProvider
+                initialRoute={initialRoute}
+                basePath={basePath}
+                onNavigate={onNavigate}
               >
-                <EmbedNavigationProvider
-                  initialRoute={initialRoute}
-                  basePath={basePath}
-                  onNavigate={onNavigate}
-                >
-                  <RouteGuard>
-                    <div className="min-h-screen">
-                      <EmbedRouter />
-                    </div>
-                  </RouteGuard>
-                </EmbedNavigationProvider>
-              </AuthProvider>
-            </SettingsConfigProvider>
-          </ConvexProviderWrapper>
+                <RouteGuard>
+                  <div className="min-h-screen">
+                    <EmbedRouter />
+                  </div>
+                </RouteGuard>
+              </EmbedNavigationProvider>
+            </AuthProvider>
+          </SettingsConfigProvider>
         </ThemeProvider>
       </ApiProvider>
     </div>

package/admin/src/embed/pages/Entry.tsx

@@ -21,12 +21,11 @@ export function EmbedEntry() {
 
   const entryId = params.entryId;
 
-  const entry = useQuery(api.getEntry, entryId ? { id: entryId } : "skip");
+  const entryArgs = entryId ? { id: entryId } : ("skip" as const);
+  const entry = useQuery(api.getEntry, entryArgs);
 
-  const contentType = useQuery(
-    api.getContentType,
-    entry ? { name: entry.contentTypeName } : "skip"
-  );
+  const contentTypeArgs = entry ? { name: entry.contentTypeName } : ("skip" as const);
+  const contentType = useQuery(api.getContentType, contentTypeArgs);
 
   if (!entryId) {
     return (

package/admin/src/embed/pages/NewEntry.tsx

@@ -18,7 +18,8 @@ export function EmbedNewEntry() {
   const { navigate, navigateToEntry, navigateToContentType } = useEmbedNavigation();
 
   const contentTypeId = params.contentTypeId;
-  const contentType = useQuery(api.getContentType, contentTypeId ? { id: contentTypeId } : "skip");
+  const contentTypeArgs = contentTypeId ? { id: contentTypeId } : ("skip" as const);
+  const contentType = useQuery(api.getContentType, contentTypeArgs);
 
   if (!contentTypeId) {
     return (

package/admin/src/embed/types.ts

@@ -16,7 +16,6 @@ export interface CmsAdminAuthConfig {
 
 export interface CmsAdminProps {
   api: CmsAdminApi;
-  convexUrl: string;
   config?: Partial<AdminConfig>;
   auth: CmsAdminAuthConfig;
   basePath?: string;

package/admin-dist/nitro.json

@@ -1,5 +1,5 @@
 {
-  "date": "2026-01-28T04:17:46.218Z",
+  "date": "2026-01-28T12:28:07.860Z",
   "preset": "node-server",
   "framework": {
     "name": "nitro",

package/admin-dist/public/assets/{CmsEmptyState-BM4e6N83.js → CmsEmptyState-la_kLGHv.js}

@@ -1 +1 @@
-import{j as e,C as n,h as x}from"./main-BapBJgQD.js";function d({icon:s,title:m,description:r,action:t,className:l,...a}){return e.jsxs("div",{className:x("flex flex-col items-center justify-center py-12 text-center",l),...a,children:[s&&e.jsx("div",{className:"mb-4 flex size-12 items-center justify-center rounded-full bg-muted text-muted-foreground",children:s}),e.jsx("h3",{className:"text-base font-semibold text-foreground",children:m}),r&&e.jsx("p",{className:"mt-1 max-w-sm text-sm text-muted-foreground",children:r}),t&&e.jsx(n,{variant:t.variant??"primary",onClick:t.onClick,className:"mt-4",children:t.label})]})}export{d as C};
+import{j as e,C as n,h as x}from"./main-BrFRroF1.js";function d({icon:s,title:m,description:r,action:t,className:l,...a}){return e.jsxs("div",{className:x("flex flex-col items-center justify-center py-12 text-center",l),...a,children:[s&&e.jsx("div",{className:"mb-4 flex size-12 items-center justify-center rounded-full bg-muted text-muted-foreground",children:s}),e.jsx("h3",{className:"text-base font-semibold text-foreground",children:m}),r&&e.jsx("p",{className:"mt-1 max-w-sm text-sm text-muted-foreground",children:r}),t&&e.jsx(n,{variant:t.variant??"primary",onClick:t.onClick,className:"mt-4",children:t.label})]})}export{d as C};

package/admin-dist/public/assets/{CmsPageHeader-uor3DPIk.js → CmsPageHeader-Cf0SafVG.js}

@@ -1 +1 @@
-import{j as e,h as m}from"./main-BapBJgQD.js";function c({title:i,description:s,actions:t,breadcrumbs:a,className:l,...r}){return e.jsxs("div",{className:m("mb-6",l),...r,children:[a&&e.jsx("div",{className:"mb-2",children:a}),e.jsxs("div",{className:"flex items-start justify-between gap-4",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("h1",{className:"text-2xl font-semibold tracking-tight text-foreground",children:i}),s&&e.jsx("p",{className:"text-sm text-muted-foreground",children:s})]}),t&&e.jsx("div",{className:"flex items-center gap-2",children:t})]})]})}export{c as C};
+import{j as e,h as m}from"./main-BrFRroF1.js";function c({title:i,description:s,actions:t,breadcrumbs:a,className:l,...r}){return e.jsxs("div",{className:m("mb-6",l),...r,children:[a&&e.jsx("div",{className:"mb-2",children:a}),e.jsxs("div",{className:"flex items-start justify-between gap-4",children:[e.jsxs("div",{className:"space-y-1",children:[e.jsx("h1",{className:"text-2xl font-semibold tracking-tight text-foreground",children:i}),s&&e.jsx("p",{className:"text-sm text-muted-foreground",children:s})]}),t&&e.jsx("div",{className:"flex items-center gap-2",children:t})]})]})}export{c as C};

package/admin-dist/public/assets/{CmsStatusBadge-D8N18LJx.js → CmsStatusBadge-BovugIHH.js}

@@ -1 +1 @@
-import{j as e,h as t}from"./main-BapBJgQD.js";import{B as a}from"./badge-BOhWFWzb.js";const c={draft:{label:"Draft",className:"status-draft",icon:e.jsx("svg",{className:"size-3",fill:"currentColor",viewBox:"0 0 8 8",children:e.jsx("circle",{cx:"4",cy:"4",r:"3"})})},published:{label:"Published",className:"status-published",icon:e.jsx("svg",{className:"size-3",fill:"none",stroke:"currentColor",strokeWidth:"2",viewBox:"0 0 24 24",children:e.jsx("path",{strokeLinecap:"round",strokeLinejoin:"round",d:"M5 13l4 4L19 7"})})},scheduled:{label:"Scheduled",className:"status-scheduled",icon:e.jsxs("svg",{className:"size-3",fill:"none",stroke:"currentColor",strokeWidth:"2",viewBox:"0 0 24 24",children:[e.jsx("circle",{cx:"12",cy:"12",r:"10"}),e.jsx("path",{strokeLinecap:"round",d:"M12 6v6l4 2"})]})},archived:{label:"Archived",className:"status-archived",icon:e.jsx("svg",{className:"size-3",fill:"none",stroke:"currentColor",strokeWidth:"2",viewBox:"0 0 24 24",children:e.jsx("path",{strokeLinecap:"round",strokeLinejoin:"round",d:"M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4"})})}},n={gray:"bg-muted text-muted-foreground",yellow:"bg-diff-modified-bg text-diff-modified-foreground",blue:"bg-info-bg text-info-foreground",green:"bg-diff-added-bg text-diff-added-foreground",red:"bg-diff-removed-bg text-diff-removed-foreground",purple:"bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-400",orange:"bg-diff-modified-bg text-diff-modified-foreground"};function l(){return e.jsx("svg",{className:"size-3",fill:"currentColor",viewBox:"0 0 8 8",children:e.jsx("circle",{cx:"4",cy:"4",r:"3"})})}function x({status:d,customConfig:s,className:o,...i}){if(s)return e.jsxs(a,{variant:"secondary",className:t("gap-1.5 px-2 py-0.5 text-xs font-medium",n[s.color],o),...i,children:[l(),s.displayName]});const r=c[d];return r?e.jsxs(a,{variant:"secondary",className:t("gap-1.5 px-2 py-0.5 text-xs font-medium",r.className,o),...i,children:[r.icon,r.label]}):e.jsxs(a,{variant:"secondary",className:t("gap-1.5 px-2 py-0.5 text-xs font-medium",n.gray,o),...i,children:[l(),d]})}export{x as C};
+import{j as e,h as t}from"./main-BrFRroF1.js";import{B as a}from"./badge-Cmc3T9vs.js";const c={draft:{label:"Draft",className:"status-draft",icon:e.jsx("svg",{className:"size-3",fill:"currentColor",viewBox:"0 0 8 8",children:e.jsx("circle",{cx:"4",cy:"4",r:"3"})})},published:{label:"Published",className:"status-published",icon:e.jsx("svg",{className:"size-3",fill:"none",stroke:"currentColor",strokeWidth:"2",viewBox:"0 0 24 24",children:e.jsx("path",{strokeLinecap:"round",strokeLinejoin:"round",d:"M5 13l4 4L19 7"})})},scheduled:{label:"Scheduled",className:"status-scheduled",icon:e.jsxs("svg",{className:"size-3",fill:"none",stroke:"currentColor",strokeWidth:"2",viewBox:"0 0 24 24",children:[e.jsx("circle",{cx:"12",cy:"12",r:"10"}),e.jsx("path",{strokeLinecap:"round",d:"M12 6v6l4 2"})]})},archived:{label:"Archived",className:"status-archived",icon:e.jsx("svg",{className:"size-3",fill:"none",stroke:"currentColor",strokeWidth:"2",viewBox:"0 0 24 24",children:e.jsx("path",{strokeLinecap:"round",strokeLinejoin:"round",d:"M5 8h14M5 8a2 2 0 110-4h14a2 2 0 110 4M5 8v10a2 2 0 002 2h10a2 2 0 002-2V8m-9 4h4"})})}},n={gray:"bg-muted text-muted-foreground",yellow:"bg-diff-modified-bg text-diff-modified-foreground",blue:"bg-info-bg text-info-foreground",green:"bg-diff-added-bg text-diff-added-foreground",red:"bg-diff-removed-bg text-diff-removed-foreground",purple:"bg-purple-100 text-purple-800 dark:bg-purple-900/30 dark:text-purple-400",orange:"bg-diff-modified-bg text-diff-modified-foreground"};function l(){return e.jsx("svg",{className:"size-3",fill:"currentColor",viewBox:"0 0 8 8",children:e.jsx("circle",{cx:"4",cy:"4",r:"3"})})}function x({status:d,customConfig:s,className:o,...i}){if(s)return e.jsxs(a,{variant:"secondary",className:t("gap-1.5 px-2 py-0.5 text-xs font-medium",n[s.color],o),...i,children:[l(),s.displayName]});const r=c[d];return r?e.jsxs(a,{variant:"secondary",className:t("gap-1.5 px-2 py-0.5 text-xs font-medium",r.className,o),...i,children:[r.icon,r.label]}):e.jsxs(a,{variant:"secondary",className:t("gap-1.5 px-2 py-0.5 text-xs font-medium",n.gray,o),...i,children:[l(),d]})}export{x as C};

package/admin-dist/public/assets/{CmsSurface-BEcY-WpI.js → CmsSurface-Dp1TegU4.js}

@@ -1 +1 @@
-import{j as r,h as t}from"./main-BapBJgQD.js";const l={base:"surface-base",elevated:"surface-elevated",floating:"surface-floating"},m={none:"",sm:"p-3",md:"p-4",lg:"p-6"},u={none:"rounded-none",sm:"rounded-sm",md:"rounded-md",lg:"rounded-lg"};function f({elevation:e="base",padding:s="md",rounded:n="lg",className:a,children:d,...o}){return r.jsx("div",{className:t(l[e],m[s],u[n],a),...o,children:d})}export{f as C};
+import{j as r,h as t}from"./main-BrFRroF1.js";const l={base:"surface-base",elevated:"surface-elevated",floating:"surface-floating"},m={none:"",sm:"p-3",md:"p-4",lg:"p-6"},u={none:"rounded-none",sm:"rounded-sm",md:"rounded-md",lg:"rounded-lg"};function f({elevation:e="base",padding:s="md",rounded:n="lg",className:a,children:d,...o}){return r.jsx("div",{className:t(l[e],m[s],u[n],a),...o,children:d})}export{f as C};

package/admin-dist/public/assets/{CmsToolbar-DE-bu3W8.js → CmsToolbar-B1zdfMu0.js}

@@ -1 +1 @@
-import{j as e,I as i,h as o}from"./main-BapBJgQD.js";import{S as p}from"./search-CSyHHglh.js";function u({left:t,right:s,search:a,filters:r,actions:l,className:n,children:x,...m}){return e.jsxs("div",{className:o("flex flex-wrap items-center justify-between gap-3 pb-4",n),...m,children:[e.jsxs("div",{className:"flex flex-1 flex-wrap items-center gap-2",children:[a&&e.jsxs("div",{className:"relative w-full max-w-xs",children:[e.jsx(p,{className:"absolute left-3 top-1/2 size-4 -translate-y-1/2 text-muted-foreground"}),e.jsx(i,{type:"search",placeholder:a.placeholder??"Search...",value:a.value,onChange:c=>a.onChange(c.target.value),className:"pl-9"})]}),r,t,x]}),(s||l)&&e.jsx("div",{className:"flex items-center gap-2",children:s??l})]})}export{u as C};
+import{j as e,I as i,h as o}from"./main-BrFRroF1.js";import{S as p}from"./search-BsuImjd-.js";function u({left:t,right:s,search:a,filters:r,actions:l,className:n,children:x,...m}){return e.jsxs("div",{className:o("flex flex-wrap items-center justify-between gap-3 pb-4",n),...m,children:[e.jsxs("div",{className:"flex flex-1 flex-wrap items-center gap-2",children:[a&&e.jsxs("div",{className:"relative w-full max-w-xs",children:[e.jsx(p,{className:"absolute left-3 top-1/2 size-4 -translate-y-1/2 text-muted-foreground"}),e.jsx(i,{type:"search",placeholder:a.placeholder??"Search...",value:a.value,onChange:c=>a.onChange(c.target.value),className:"pl-9"})]}),r,t,x]}),(s||l)&&e.jsx("div",{className:"flex items-center gap-2",children:s??l})]})}export{u as C};