tinacms 2.9.0 → 2.9.1

package/dist/index.js

@@ -39267,7 +39267,8 @@ Please wrap them with useCallback or configure the deps array correctly.`
           },
           className: classNames(
             toolbarItem.active ? "bg-gray-50 text-blue-500" : "bg-white text-gray-600",
-            "hover:bg-gray-50 hover:text-blue-500 cursor-pointer pointer-events-auto px-4 py-2 text-sm w-full flex items-center whitespace-nowrap"
+            "hover:bg-gray-50 hover:text-blue-500 cursor-pointer pointer-events-auto px-4 py-2 text-sm w-full flex items-center whitespace-nowrap",
+            toolbarItem.className ?? ""
           )
         },
         /* @__PURE__ */ React.createElement("div", { className: "mr-2 opacity-80" }, toolbarItem.Icon),
@@ -40342,6 +40343,18 @@ Please wrap them with useCallback or configure the deps array correctly.`
     name: "group",
     Component: Group
   };
+  const constructUrlWithBasePath = (url, basePath) => {
+    if (!url)
+      return url;
+    if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//")) {
+      return url;
+    }
+    if (basePath) {
+      const cleanBasePath = basePath.replace(/^\/+|\/+$/g, "");
+      return `/${cleanBasePath}/${url}`;
+    }
+    return url;
+  };
   const BlockSelectorBig = ({
     templates,
     addItem,
@@ -40541,6 +40554,10 @@ Please wrap them with useCallback or configure the deps array correctly.`
     );
   };
   const BlockCard = ({ close: close2, name, template }) => {
+    const cms = useCMS$1();
+    const basePath = cms.flags.get("tina-basepath");
+    const basePathStr = typeof basePath === "string" ? basePath : void 0;
+    const previewSrc = template.previewSrc ? constructUrlWithBasePath(template.previewSrc, basePathStr) : void 0;
     return /* @__PURE__ */ React__namespace.createElement(
       "button",
       {
@@ -40551,17 +40568,17 @@ Please wrap them with useCallback or configure the deps array correctly.`
           close2(name, template);
         }
       },
-      template.previewSrc && /* @__PURE__ */ React__namespace.createElement(
+      previewSrc && /* @__PURE__ */ React__namespace.createElement(
         "img",
         {
-          src: template.previewSrc,
+          src: previewSrc,
           className: "w-full h-auto transition-all ease-out duration-150 group-hover:opacity-50"
         }
       ),
       /* @__PURE__ */ React__namespace.createElement(
         "span",
         {
-          className: `relative flex justify-between items-center gap-4 w-full px-4 text-left ${template.previewSrc ? `py-2 border-t border-gray-100 ` : `py-3`}`
+          className: `relative flex justify-between items-center gap-4 w-full px-4 text-left ${previewSrc ? `py-2 border-t border-gray-100 ` : `py-3`}`
         },
         template.label ? template.label : name,
         /* @__PURE__ */ React__namespace.createElement(AddIcon, { className: "w-5 h-auto group-hover:text-blue-500 opacity-30 transition-all ease-out duration-150 group-hover:opacity-80" })
@@ -44833,8 +44850,8 @@ Please wrap them with useCallback or configure the deps array correctly.`
           variant: "primary",
           onClick: () => selectMediaItem(activeItem)
         },
-        "Insert",
-        /* @__PURE__ */ React.createElement(BiArrowToBottom, { className: "ml-1 -mr-0.5 w-6 h-auto opacity-70" })
+        /* @__PURE__ */ React.createElement(BiArrowToBottom, { className: "mr-1 -ml-0.5 w-6 h-auto opacity-70" }),
+        "Insert"
       ), allowDelete && /* @__PURE__ */ React.createElement(
         Button$1,
         {
@@ -44842,8 +44859,8 @@ Please wrap them with useCallback or configure the deps array correctly.`
           size: "medium",
           onClick: deleteMediaItem
         },
-        "Delete",
-        /* @__PURE__ */ React.createElement(TrashIcon, { className: "ml-1 -mr-0.5 w-6 h-auto opacity-70" })
+        /* @__PURE__ */ React.createElement(TrashIcon, { className: "mr-1 -ml-0.5 w-6 h-auto opacity-70" }),
+        "Delete"
       ))))
     );
   };
@@ -45943,7 +45960,7 @@ Please wrap them with useCallback or configure the deps array correctly.`
     requiredArgs(1, arguments);
     return formatDistance(dirtyDate, Date.now(), options);
   }
-  const version$1 = "2.9.0";
+  const version$1 = "2.9.1";
   const VersionInfo = () => {
     var _a2, _b, _c, _d, _e, _f;
     const cms = useCMS();
@@ -63819,7 +63836,9 @@ mutation DeleteDocument($collection: String!, $relativePath: String!){
     const tinaApi = cms.api.tina;
     const { setCurrentBranch } = useBranchData();
     const [disabled, setDisabled] = React__namespace.useState(false);
-    const [newBranchName, setNewBranchName] = React__namespace.useState("");
+    const [newBranchName, setNewBranchName] = React__namespace.useState(
+      `${crudType}-${path2}`
+    );
     const [isExecuting, setIsExecuting] = React__namespace.useState(false);
     const [errorMessage, setErrorMessage] = React__namespace.useState("");
     const [currentStep, setCurrentStep] = React__namespace.useState(0);
@@ -64031,7 +64050,15 @@ mutation DeleteDocument($collection: String!, $relativePath: String!){
       if (isExecuting) {
         return renderProgressIndicator();
       } else {
-        return /* @__PURE__ */ React__namespace.createElement("div", { className: "max-w-sm" }, errorMessage && /* @__PURE__ */ React__namespace.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React__namespace.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React__namespace.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React__namespace.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React__namespace.createElement("p", { className: "text-lg text-gray-700 font-bold mb-2" }, "This content is protected 🚧"), /* @__PURE__ */ React__namespace.createElement("p", { className: "text-sm text-gray-700 mb-4 max-w-sm" }, "To make changes, you need to create a copy then get it approved and merged for it to go live."), /* @__PURE__ */ React__namespace.createElement(
+        return /* @__PURE__ */ React__namespace.createElement("div", { className: "max-w-sm" }, errorMessage && /* @__PURE__ */ React__namespace.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React__namespace.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React__namespace.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React__namespace.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React__namespace.createElement("p", { className: "text-lg text-gray-700 font-bold mb-2" }, "First, let's create a copy"), /* @__PURE__ */ React__namespace.createElement("p", { className: "text-sm text-gray-700 mb-4 max-w-sm" }, "To make changes, you need to create a copy then get it approved and merged for it to go live. Learn more about", " ", /* @__PURE__ */ React__namespace.createElement(
+          "a",
+          {
+            className: "underline hover:text-tina-orange",
+            href: "https://tina.io/docs/tinacloud/editorial-workflow",
+            target: "_blank"
+          },
+          "Editorial Workflow"
+        ), "."), /* @__PURE__ */ React__namespace.createElement(
           PrefixedTextField,
           {
             placeholder: "e.g. {{PAGE-NAME}}-updates",
@@ -64053,7 +64080,7 @@ mutation DeleteDocument($collection: String!, $relativePath: String!){
         disabled: newBranchName === "" || disabled,
         onClick: executeEditorialWorkflow
       },
-      "Confirm"
+      "Continue"
     ), /* @__PURE__ */ React__namespace.createElement(
       OverflowMenu$1,
       {
@@ -119009,7 +119036,7 @@ mutation addPendingDocumentMutation(
     }
     usingProtectedBranch() {
       var _a2;
-      return this.usingEditorialWorkflow && ((_a2 = this.protectedBranches) == null ? void 0 : _a2.includes(this.branch));
+      return this.usingEditorialWorkflow && ((_a2 = this.protectedBranches) == null ? void 0 : _a2.includes(decodeURIComponent(this.branch)));
     }
     async createBranch({ baseBranch, branchName }) {
       const url = `${this.contentApiBase}/github/${this.clientId}/create_branch`;
@@ -120541,6 +120568,7 @@ This will work when developing locally but NOT when deployed to production.
     const plugins2 = cms.plugins.all("tina-admin");
     const routeMapping = plugins2.find(({ name }) => name === "route-mapping");
     const tinaPreview = cms.flags.get("tina-preview") || false;
+    const basePath = cms.flags.get("tina-basepath");
     let routeOverride = ((_a2 = collectionDefinition.ui) == null ? void 0 : _a2.router) ? await ((_b = collectionDefinition.ui) == null ? void 0 : _b.router({
       document: document2,
       collection: collectionDefinition
@@ -120549,7 +120577,7 @@ This will work when developing locally but NOT when deployed to production.
       if (routeOverride.startsWith("/")) {
         routeOverride = routeOverride.slice(1);
       }
-      tinaPreview ? navigate(`/~/${routeOverride}`) : window.location.href = routeOverride;
+      tinaPreview ? navigate(`/~${basePath ? `/${basePath}` : ""}/${routeOverride}`) : window.location.href = `${basePath ? `/${basePath}` : ""}/${routeOverride}`;
       return null;
     } else {
       const pathToDoc = document2._sys.breadcrumbs;
@@ -121086,15 +121114,9 @@ This will work when developing locally but NOT when deployed to production.
                       }
                     },
                     allowDelete && {
-                      name: "delete",
-                      label: "Delete",
-                      Icon: /* @__PURE__ */ React.createElement(
-                        BiTrash,
-                        {
-                          size: "1.3rem",
-                          className: "text-red-500"
-                        }
-                      ),
+                      name: "rename",
+                      label: "Rename",
+                      Icon: /* @__PURE__ */ React.createElement(BiRename, { size: "1.3rem" }),
                       onMouseDown: () => {
                         setVars((old) => ({
                           ...old,
@@ -121107,19 +121129,20 @@ This will work when developing locally but NOT when deployed to production.
                           ) + document2.node._sys.extension,
                           newRelativePath: ""
                         }));
-                        setDeleteModalOpen(true);
+                        setRenameModalOpen(true);
                       }
                     },
                     allowDelete && {
-                      name: "rename",
-                      label: "Rename",
+                      name: "delete",
+                      label: "Delete",
                       Icon: /* @__PURE__ */ React.createElement(
-                        BiRename,
+                        BiTrash,
                         {
                           size: "1.3rem",
                           className: "text-red-500"
                         }
                       ),
+                      className: "text-red-500",
                       onMouseDown: () => {
                         setVars((old) => ({
                           ...old,
@@ -121132,7 +121155,7 @@ This will work when developing locally but NOT when deployed to production.
                           ) + document2.node._sys.extension,
                           newRelativePath: ""
                         }));
-                        setRenameModalOpen(true);
+                        setDeleteModalOpen(true);
                       }
                     }
                   ].filter(Boolean)

package/dist/index.mjs

@@ -39294,7 +39294,8 @@ const OverflowMenu$1 = ({ toolbarItems: toolbarItems2, className = "w-full" }) =
         },
         className: classNames(
           toolbarItem.active ? "bg-gray-50 text-blue-500" : "bg-white text-gray-600",
-          "hover:bg-gray-50 hover:text-blue-500 cursor-pointer pointer-events-auto px-4 py-2 text-sm w-full flex items-center whitespace-nowrap"
+          "hover:bg-gray-50 hover:text-blue-500 cursor-pointer pointer-events-auto px-4 py-2 text-sm w-full flex items-center whitespace-nowrap",
+          toolbarItem.className ?? ""
         )
       },
       /* @__PURE__ */ React__default.createElement("div", { className: "mr-2 opacity-80" }, toolbarItem.Icon),
@@ -40369,6 +40370,18 @@ const GroupFieldPlugin = {
   name: "group",
   Component: Group
 };
+const constructUrlWithBasePath = (url, basePath) => {
+  if (!url)
+    return url;
+  if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//")) {
+    return url;
+  }
+  if (basePath) {
+    const cleanBasePath = basePath.replace(/^\/+|\/+$/g, "");
+    return `/${cleanBasePath}/${url}`;
+  }
+  return url;
+};
 const BlockSelectorBig = ({
   templates,
   addItem,
@@ -40568,6 +40581,10 @@ const CardColumns = ({ children, className = "" }) => {
   );
 };
 const BlockCard = ({ close: close2, name, template }) => {
+  const cms = useCMS$1();
+  const basePath = cms.flags.get("tina-basepath");
+  const basePathStr = typeof basePath === "string" ? basePath : void 0;
+  const previewSrc = template.previewSrc ? constructUrlWithBasePath(template.previewSrc, basePathStr) : void 0;
   return /* @__PURE__ */ React.createElement(
     "button",
     {
@@ -40578,17 +40595,17 @@ const BlockCard = ({ close: close2, name, template }) => {
         close2(name, template);
       }
     },
-    template.previewSrc && /* @__PURE__ */ React.createElement(
+    previewSrc && /* @__PURE__ */ React.createElement(
       "img",
       {
-        src: template.previewSrc,
+        src: previewSrc,
         className: "w-full h-auto transition-all ease-out duration-150 group-hover:opacity-50"
       }
     ),
     /* @__PURE__ */ React.createElement(
       "span",
       {
-        className: `relative flex justify-between items-center gap-4 w-full px-4 text-left ${template.previewSrc ? `py-2 border-t border-gray-100 ` : `py-3`}`
+        className: `relative flex justify-between items-center gap-4 w-full px-4 text-left ${previewSrc ? `py-2 border-t border-gray-100 ` : `py-3`}`
       },
       template.label ? template.label : name,
       /* @__PURE__ */ React.createElement(AddIcon, { className: "w-5 h-auto group-hover:text-blue-500 opacity-30 transition-all ease-out duration-150 group-hover:opacity-80" })
@@ -44860,8 +44877,8 @@ const ActiveItemPreview = ({
         variant: "primary",
         onClick: () => selectMediaItem(activeItem)
       },
-      "Insert",
-      /* @__PURE__ */ React__default.createElement(BiArrowToBottom, { className: "ml-1 -mr-0.5 w-6 h-auto opacity-70" })
+      /* @__PURE__ */ React__default.createElement(BiArrowToBottom, { className: "mr-1 -ml-0.5 w-6 h-auto opacity-70" }),
+      "Insert"
     ), allowDelete && /* @__PURE__ */ React__default.createElement(
       Button$1,
       {
@@ -44869,8 +44886,8 @@ const ActiveItemPreview = ({
         size: "medium",
         onClick: deleteMediaItem
       },
-      "Delete",
-      /* @__PURE__ */ React__default.createElement(TrashIcon, { className: "ml-1 -mr-0.5 w-6 h-auto opacity-70" })
+      /* @__PURE__ */ React__default.createElement(TrashIcon, { className: "mr-1 -ml-0.5 w-6 h-auto opacity-70" }),
+      "Delete"
     ))))
   );
 };
@@ -45970,7 +45987,7 @@ function formatDistanceToNow(dirtyDate, options) {
   requiredArgs(1, arguments);
   return formatDistance2(dirtyDate, Date.now(), options);
 }
-const version$1 = "2.9.0";
+const version$1 = "2.9.1";
 const VersionInfo = () => {
   var _a2, _b, _c, _d, _e, _f;
   const cms = useCMS();
@@ -63846,7 +63863,9 @@ const CreateBranchModal = ({
   const tinaApi = cms.api.tina;
   const { setCurrentBranch } = useBranchData();
   const [disabled, setDisabled] = React.useState(false);
-  const [newBranchName, setNewBranchName] = React.useState("");
+  const [newBranchName, setNewBranchName] = React.useState(
+    `${crudType}-${path3}`
+  );
   const [isExecuting, setIsExecuting] = React.useState(false);
   const [errorMessage, setErrorMessage] = React.useState("");
   const [currentStep, setCurrentStep] = React.useState(0);
@@ -64058,7 +64077,15 @@ const CreateBranchModal = ({
     if (isExecuting) {
       return renderProgressIndicator();
     } else {
-      return /* @__PURE__ */ React.createElement("div", { className: "max-w-sm" }, errorMessage && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React.createElement("p", { className: "text-lg text-gray-700 font-bold mb-2" }, "This content is protected 🚧"), /* @__PURE__ */ React.createElement("p", { className: "text-sm text-gray-700 mb-4 max-w-sm" }, "To make changes, you need to create a copy then get it approved and merged for it to go live."), /* @__PURE__ */ React.createElement(
+      return /* @__PURE__ */ React.createElement("div", { className: "max-w-sm" }, errorMessage && /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-1 text-red-700 py-2 px-3 mb-4 bg-red-50 border border-red-200 rounded" }, /* @__PURE__ */ React.createElement(BiError, { className: "w-5 h-auto text-red-400 flex-shrink-0" }), /* @__PURE__ */ React.createElement("span", { className: "text-sm" }, /* @__PURE__ */ React.createElement("b", null, "Error:"), " ", errorMessage)), /* @__PURE__ */ React.createElement("p", { className: "text-lg text-gray-700 font-bold mb-2" }, "First, let's create a copy"), /* @__PURE__ */ React.createElement("p", { className: "text-sm text-gray-700 mb-4 max-w-sm" }, "To make changes, you need to create a copy then get it approved and merged for it to go live. Learn more about", " ", /* @__PURE__ */ React.createElement(
+        "a",
+        {
+          className: "underline hover:text-tina-orange",
+          href: "https://tina.io/docs/tinacloud/editorial-workflow",
+          target: "_blank"
+        },
+        "Editorial Workflow"
+      ), "."), /* @__PURE__ */ React.createElement(
         PrefixedTextField,
         {
           placeholder: "e.g. {{PAGE-NAME}}-updates",
@@ -64080,7 +64107,7 @@ const CreateBranchModal = ({
       disabled: newBranchName === "" || disabled,
       onClick: executeEditorialWorkflow
     },
-    "Confirm"
+    "Continue"
   ), /* @__PURE__ */ React.createElement(
     OverflowMenu$1,
     {
@@ -119036,7 +119063,7 @@ mutation addPendingDocumentMutation(
   }
   usingProtectedBranch() {
     var _a2;
-    return this.usingEditorialWorkflow && ((_a2 = this.protectedBranches) == null ? void 0 : _a2.includes(this.branch));
+    return this.usingEditorialWorkflow && ((_a2 = this.protectedBranches) == null ? void 0 : _a2.includes(decodeURIComponent(this.branch)));
   }
   async createBranch({ baseBranch, branchName }) {
     const url = `${this.contentApiBase}/github/${this.clientId}/create_branch`;
@@ -120568,6 +120595,7 @@ const handleNavigate = async (navigate, cms, collection, collectionDefinition, d
   const plugins2 = cms.plugins.all("tina-admin");
   const routeMapping = plugins2.find(({ name }) => name === "route-mapping");
   const tinaPreview = cms.flags.get("tina-preview") || false;
+  const basePath = cms.flags.get("tina-basepath");
   let routeOverride = ((_a2 = collectionDefinition.ui) == null ? void 0 : _a2.router) ? await ((_b = collectionDefinition.ui) == null ? void 0 : _b.router({
     document: document2,
     collection: collectionDefinition
@@ -120576,7 +120604,7 @@ const handleNavigate = async (navigate, cms, collection, collectionDefinition, d
     if (routeOverride.startsWith("/")) {
       routeOverride = routeOverride.slice(1);
     }
-    tinaPreview ? navigate(`/~/${routeOverride}`) : window.location.href = routeOverride;
+    tinaPreview ? navigate(`/~${basePath ? `/${basePath}` : ""}/${routeOverride}`) : window.location.href = `${basePath ? `/${basePath}` : ""}/${routeOverride}`;
     return null;
   } else {
     const pathToDoc = document2._sys.breadcrumbs;
@@ -121113,15 +121141,9 @@ const CollectionListPage = () => {
                     }
                   },
                   allowDelete && {
-                    name: "delete",
-                    label: "Delete",
-                    Icon: /* @__PURE__ */ React__default.createElement(
-                      BiTrash,
-                      {
-                        size: "1.3rem",
-                        className: "text-red-500"
-                      }
-                    ),
+                    name: "rename",
+                    label: "Rename",
+                    Icon: /* @__PURE__ */ React__default.createElement(BiRename, { size: "1.3rem" }),
                     onMouseDown: () => {
                       setVars((old) => ({
                         ...old,
@@ -121134,19 +121156,20 @@ const CollectionListPage = () => {
                         ) + document2.node._sys.extension,
                         newRelativePath: ""
                       }));
-                      setDeleteModalOpen(true);
+                      setRenameModalOpen(true);
                     }
                   },
                   allowDelete && {
-                    name: "rename",
-                    label: "Rename",
+                    name: "delete",
+                    label: "Delete",
                     Icon: /* @__PURE__ */ React__default.createElement(
-                      BiRename,
+                      BiTrash,
                       {
                         size: "1.3rem",
                         className: "text-red-500"
                       }
                     ),
+                    className: "text-red-500",
                     onMouseDown: () => {
                       setVars((old) => ({
                         ...old,
@@ -121159,7 +121182,7 @@ const CollectionListPage = () => {
                         ) + document2.node._sys.extension,
                         newRelativePath: ""
                       }));
-                      setRenameModalOpen(true);
+                      setDeleteModalOpen(true);
                     }
                   }
                 ].filter(Boolean)

package/dist/rich-text/index.d.ts

@@ -58,9 +58,15 @@ type BaseComponents = {
     lic?: {
         children: JSX.Element;
     };
+    /**
+     * @deprecated Use `blockquote` instead. This was incorrectly named and will be removed in a future version.
+     */
     block_quote?: {
         children: JSX.Element;
     };
+    blockquote?: {
+        children: JSX.Element;
+    };
     code_block?: {
         lang?: string;
         value: string;

package/dist/rich-text/index.js

@@ -82,7 +82,6 @@
       case "h5":
       case "h6":
       case "p":
-      case "blockquote":
       case "ol":
       case "ul":
       case "li":
@@ -99,6 +98,14 @@
           return /* @__PURE__ */ React.createElement(Component2, { ...props }, /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: children }));
         }
         return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: child.children }));
+      case "blockquote":
+        const BlockquoteComponent = components.blockquote || components.block_quote;
+        if (BlockquoteComponent) {
+          return /* @__PURE__ */ React.createElement(BlockquoteComponent, { ...props }, /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: children }));
+        }
+        return React.createElement("blockquote", {
+          children: /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: children })
+        });
       case "img":
         if (components[child.type]) {
           const Component2 = components[child.type];

package/dist/rich-text/index.mjs

@@ -79,7 +79,6 @@ const Node = ({ components, child }) => {
     case "h5":
     case "h6":
     case "p":
-    case "blockquote":
     case "ol":
     case "ul":
     case "li":
@@ -96,6 +95,14 @@ const Node = ({ components, child }) => {
         return /* @__PURE__ */ React.createElement(Component2, { ...props }, /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: children }));
       }
       return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: child.children }));
+    case "blockquote":
+      const BlockquoteComponent = components.blockquote || components.block_quote;
+      if (BlockquoteComponent) {
+        return /* @__PURE__ */ React.createElement(BlockquoteComponent, { ...props }, /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: children }));
+      }
+      return React.createElement("blockquote", {
+        children: /* @__PURE__ */ React.createElement(TinaMarkdown, { components, content: children })
+      });
     case "img":
       if (components[child.type]) {
         const Component2 = components[child.type];

package/dist/rich-text/static.d.ts

@@ -63,9 +63,15 @@ type BaseComponents = {
     lic?: {
         children: JSX.Element;
     };
+    /**
+     * @deprecated Use `blockquote` instead. This was incorrectly named and will be removed in a future version.
+     */
     block_quote?: {
         children: JSX.Element;
     };
+    blockquote?: {
+        children: JSX.Element;
+    };
     code_block?: {
         lang?: string;
         value: string;

package/dist/rich-text/static.js

@@ -59,7 +59,6 @@
       case "h5":
       case "h6":
       case "p":
-      case "blockquote":
       case "ol":
       case "ul":
       case "li":
@@ -70,6 +69,14 @@
         return React.createElement(child.type, {
           children: /* @__PURE__ */ React.createElement(StaticTinaMarkdown, { components, content: children })
         });
+      case "blockquote":
+        const BlockquoteComponent = components.blockquote || components.block_quote;
+        if (BlockquoteComponent) {
+          return /* @__PURE__ */ React.createElement(BlockquoteComponent, { ...props }, /* @__PURE__ */ React.createElement(StaticTinaMarkdown, { components, content: children }));
+        }
+        return React.createElement("blockquote", {
+          children: /* @__PURE__ */ React.createElement(StaticTinaMarkdown, { components, content: children })
+        });
       case "lic":
         if (components.lic) {
           const Component2 = components.lic;

package/dist/rich-text/static.mjs

@@ -56,7 +56,6 @@ const Node = ({
     case "h5":
     case "h6":
     case "p":
-    case "blockquote":
     case "ol":
     case "ul":
     case "li":
@@ -67,6 +66,14 @@ const Node = ({
       return React.createElement(child.type, {
         children: /* @__PURE__ */ React.createElement(StaticTinaMarkdown, { components, content: children })
       });
+    case "blockquote":
+      const BlockquoteComponent = components.blockquote || components.block_quote;
+      if (BlockquoteComponent) {
+        return /* @__PURE__ */ React.createElement(BlockquoteComponent, { ...props }, /* @__PURE__ */ React.createElement(StaticTinaMarkdown, { components, content: children }));
+      }
+      return React.createElement("blockquote", {
+        children: /* @__PURE__ */ React.createElement(StaticTinaMarkdown, { components, content: children })
+      });
     case "lic":
       if (components.lic) {
         const Component2 = components.lic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {