tinacms 0.0.0-d7c745e-20250102002342 → 0.0.0-d9672bc-20250218033222

package/dist/client.js

@@ -1,6 +1,6 @@
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports) : typeof define === "function" && define.amd ? define(["exports"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}));
-})(this, function(exports2) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("async-lock")) : typeof define === "function" && define.amd ? define(["exports", "async-lock"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP));
+})(this, function(exports2, AsyncLock) {
   "use strict";
   const TINA_HOST = "content.tinajs.io";
   class TinaClient {
@@ -26,6 +26,7 @@
         if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
           const { NodeCache: NodeCache2 } = await Promise.resolve().then(() => nodeCache);
           this.cache = await NodeCache2(this.cacheDir);
+          this.cacheLock = new AsyncLock();
         }
       } catch (e) {
         console.error(e);
@@ -62,42 +63,58 @@
         ...providedFetchOptions
       };
       let key = "";
+      let result;
       if (this.cache) {
         key = this.cache.makeKey(bodyString);
-        const value = await this.cache.get(key);
-        if (value) {
-          return value;
-        }
-      }
-      const res = await fetch(url, optionsObject);
-      if (!res.ok) {
-        let additionalInfo = "";
-        if (res.status === 401) {
-          additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
-        }
-        throw new Error(
-          `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
-        );
-      }
-      const json = await res.json();
-      if (json.errors && errorPolicyDefined === "throw") {
-        throw new Error(
-          `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-        Errors: 
-	${json.errors.map((error) => error.message).join("\n")}`
+        await this.cacheLock.acquire(key, async () => {
+          result = await this.cache.get(key);
+          if (!result) {
+            result = await requestFromServer(
+              url,
+              args.query,
+              optionsObject,
+              errorPolicyDefined
+            );
+            await this.cache.set(key, result);
+          }
+        });
+      } else {
+        result = await requestFromServer(
+          url,
+          args.query,
+          optionsObject,
+          errorPolicyDefined
         );
       }
-      const result = {
-        data: json == null ? void 0 : json.data,
-        errors: (json == null ? void 0 : json.errors) || null,
-        query: args.query
-      };
-      if (this.cache) {
-        await this.cache.set(key, result);
-      }
       return result;
     }
   }
+  async function requestFromServer(url, query, optionsObject, errorPolicyDefined) {
+    const res = await fetch(url, optionsObject);
+    if (!res.ok) {
+      let additionalInfo = "";
+      if (res.status === 401) {
+        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+      }
+      throw new Error(
+        `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      );
+    }
+    const json = await res.json();
+    if (json.errors && errorPolicyDefined === "throw") {
+      throw new Error(
+        `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`
+      );
+    }
+    const result = {
+      data: json == null ? void 0 : json.data,
+      errors: (json == null ? void 0 : json.errors) || null,
+      query
+    };
+    return result;
+  }
   function createClient(args) {
     const client = new TinaClient(args);
     return client;
@@ -129,22 +146,35 @@
         return createHash("sha256").update(input).digest("hex");
       },
       get: async (key) => {
+        let readValue;
+        const cacheFilename = `${cacheDir}/${key}`;
         try {
-          const data = await fs.promises.readFile(`${cacheDir}/${key}`, "utf-8");
-          return JSON.parse(data);
+          const data = await fs.promises.readFile(cacheFilename, "utf-8");
+          readValue = JSON.parse(data);
         } catch (e) {
-          if (e.code === "ENOENT") {
-            return void 0;
+          if (e.code !== "ENOENT") {
+            console.error(
+              `Failed to read cache file to ${cacheFilename}: ${e.message}`
+            );
           }
-          throw e;
         }
+        return readValue;
       },
       set: async (key, value) => {
-        await fs.promises.writeFile(
-          `${cacheDir}/${key}`,
-          JSON.stringify(value),
-          "utf-8"
-        );
+        const cacheFilename = `${cacheDir}/${key}`;
+        try {
+          await fs.promises.writeFile(cacheFilename, JSON.stringify(value), {
+            encoding: "utf-8",
+            flag: "wx"
+            // Don't overwrite existing caches
+          });
+        } catch (e) {
+          if (e.code !== "EEXIST") {
+            console.error(
+              `Failed to write cache file to ${cacheFilename}: ${e.message}`
+            );
+          }
+        }
       }
     };
   };

package/dist/client.mjs

@@ -1,3 +1,4 @@
+import AsyncLock from "async-lock";
 const TINA_HOST = "content.tinajs.io";
 class TinaClient {
   constructor({
@@ -20,8 +21,9 @@ class TinaClient {
     }
     try {
       if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
-        const { NodeCache } = await import("./node-cache-4c336858.mjs");
+        const { NodeCache } = await import("./node-cache-5e8db9f0.mjs");
         this.cache = await NodeCache(this.cacheDir);
+        this.cacheLock = new AsyncLock();
       }
     } catch (e) {
       console.error(e);
@@ -58,42 +60,58 @@ class TinaClient {
       ...providedFetchOptions
     };
     let key = "";
+    let result;
     if (this.cache) {
       key = this.cache.makeKey(bodyString);
-      const value = await this.cache.get(key);
-      if (value) {
-        return value;
-      }
-    }
-    const res = await fetch(url, optionsObject);
-    if (!res.ok) {
-      let additionalInfo = "";
-      if (res.status === 401) {
-        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
-      }
-      throw new Error(
-        `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+      await this.cacheLock.acquire(key, async () => {
+        result = await this.cache.get(key);
+        if (!result) {
+          result = await requestFromServer(
+            url,
+            args.query,
+            optionsObject,
+            errorPolicyDefined
+          );
+          await this.cache.set(key, result);
+        }
+      });
+    } else {
+      result = await requestFromServer(
+        url,
+        args.query,
+        optionsObject,
+        errorPolicyDefined
       );
     }
-    const json = await res.json();
-    if (json.errors && errorPolicyDefined === "throw") {
-      throw new Error(
-        `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
-        Errors: 
-	${json.errors.map((error) => error.message).join("\n")}`
-      );
-    }
-    const result = {
-      data: json == null ? void 0 : json.data,
-      errors: (json == null ? void 0 : json.errors) || null,
-      query: args.query
-    };
-    if (this.cache) {
-      await this.cache.set(key, result);
-    }
     return result;
   }
 }
+async function requestFromServer(url, query, optionsObject, errorPolicyDefined) {
+  const res = await fetch(url, optionsObject);
+  if (!res.ok) {
+    let additionalInfo = "";
+    if (res.status === 401) {
+      additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+    }
+    throw new Error(
+      `Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`
+    );
+  }
+  const json = await res.json();
+  if (json.errors && errorPolicyDefined === "throw") {
+    throw new Error(
+      `Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+      Errors: 
+	${json.errors.map((error) => error.message).join("\n")}`
+    );
+  }
+  const result = {
+    data: json == null ? void 0 : json.data,
+    errors: (json == null ? void 0 : json.errors) || null,
+    query
+  };
+  return result;
+}
 function createClient(args) {
   const client = new TinaClient(args);
   return client;

package/dist/index.js

@@ -5197,7 +5197,7 @@ flowchart TD
       side: "bottom",
       className: cn(
         "rounded-md border bg-white p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        "max-h-[30vh] max-w-[30vh] overflow-y-auto",
+        "max-h-[30vh] max-w-[30vw] overflow-y-auto",
         className
       ),
       ...props
@@ -5289,11 +5289,7 @@ flowchart TD
     const node = nodes.find((node2) => node2.id === value);
     return node ? node._internalSys.filename : null;
   };
-  const ComboboxDemo = ({
-    cms,
-    input,
-    field
-  }) => {
+  const Combobox = ({ cms, input, field }) => {
     const [open2, setOpen] = React__namespace.useState(false);
     const [value, setValue] = React__namespace.useState(input.value);
     const [displayText, setDisplayText] = React__namespace.useState(null);
@@ -5317,17 +5313,17 @@ flowchart TD
     if (loading === true) {
       return /* @__PURE__ */ React__namespace.createElement(LoadingDots, { color: "var(--tina-color-primary)" });
     }
-    return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, /* @__PURE__ */ React__namespace.createElement(Popover, { open: open2, onOpenChange: setOpen }, /* @__PURE__ */ React__namespace.createElement(PopoverTrigger, { asChild: true }, /* @__PURE__ */ React__namespace.createElement(
+    return /* @__PURE__ */ React__namespace.createElement(Popover, { open: open2, onOpenChange: setOpen }, /* @__PURE__ */ React__namespace.createElement(PopoverTrigger, { asChild: true }, /* @__PURE__ */ React__namespace.createElement(
       Button,
       {
         variant: "outline",
         role: "combobox",
         "aria-expanded": open2,
-        className: "w-52 justify-between"
+        className: "w-full justify-between"
       },
       /* @__PURE__ */ React__namespace.createElement("p", { className: "truncate" }, displayText ?? "Choose an option..."),
       open2 ? /* @__PURE__ */ React__namespace.createElement(IoMdArrowDropup, { size: 20 }) : /* @__PURE__ */ React__namespace.createElement(IoMdArrowDropdown, { size: 20 })
-    )), /* @__PURE__ */ React__namespace.createElement(PopoverContent, { className: "p-0 relative" }, /* @__PURE__ */ React__namespace.createElement(
+    )), /* @__PURE__ */ React__namespace.createElement(PopoverContent, { className: "p-0 relative min-w-[var(--radix-popover-trigger-width)]" }, /* @__PURE__ */ React__namespace.createElement(
       Command,
       {
         shouldFilter: !field.experimental___filter,
@@ -5351,32 +5347,25 @@ flowchart TD
         }
       ),
       /* @__PURE__ */ React__namespace.createElement(CommandEmpty, null, "No reference found"),
-      /* @__PURE__ */ React__namespace.createElement(CommandList, null, filteredOptionsList.length > 0 && (filteredOptionsList == null ? void 0 : filteredOptionsList.map(({ collection, edges }) => /* @__PURE__ */ React__namespace.createElement(
-        CommandGroup,
-        {
-          key: `${collection}-group`,
-          heading: collection
-        },
-        /* @__PURE__ */ React__namespace.createElement(CommandList, null, edges == null ? void 0 : edges.map(({ node }) => {
-          const { id, _values } = node;
-          return /* @__PURE__ */ React__namespace.createElement(
-            OptionComponent,
-            {
-              id,
-              key: id,
-              value,
-              field,
-              _values,
-              node,
-              onSelect: (currentValue) => {
-                setValue(currentValue);
-                setOpen(false);
-              }
+      /* @__PURE__ */ React__namespace.createElement(CommandList, null, filteredOptionsList.length > 0 && (filteredOptionsList == null ? void 0 : filteredOptionsList.map(({ collection, edges }) => /* @__PURE__ */ React__namespace.createElement(CommandGroup, { key: `${collection}-group`, heading: collection }, /* @__PURE__ */ React__namespace.createElement(CommandList, null, edges == null ? void 0 : edges.map(({ node }) => {
+        const { id, _values } = node;
+        return /* @__PURE__ */ React__namespace.createElement(
+          OptionComponent,
+          {
+            id,
+            key: id,
+            value,
+            field,
+            _values,
+            node,
+            onSelect: (currentValue) => {
+              setValue(currentValue);
+              setOpen(false);
             }
-          );
-        }))
-      ))))
-    ))));
+          }
+        );
+      }))))))
+    )));
   };
   const useGetNode = (cms, id) => {
     const [document2, setDocument] = React__namespace.useState(
@@ -5449,7 +5438,7 @@ flowchart TD
   };
   const Reference = ({ input, field }) => {
     const cms = useCMS();
-    return /* @__PURE__ */ React__namespace.createElement("div", null, /* @__PURE__ */ React__namespace.createElement("div", { className: "relative group" }, /* @__PURE__ */ React__namespace.createElement(ComboboxDemo, { cms, input, field })), /* @__PURE__ */ React__namespace.createElement(ReferenceLink, { cms, input }));
+    return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, /* @__PURE__ */ React__namespace.createElement("div", { className: "relative group" }, /* @__PURE__ */ React__namespace.createElement(Combobox, { cms, input, field })), /* @__PURE__ */ React__namespace.createElement(ReferenceLink, { cms, input }));
   };
   const ButtonToggle = ({
     input,
@@ -9300,6 +9289,19 @@ flowchart TD
       }
     }
   }
+  const encodeUrlIfNeeded = (url) => {
+    if (url) {
+      try {
+        const parsed = new URL(url);
+        parsed.pathname = parsed.pathname.split("/").filter((part) => part !== "").map(encodeURIComponent).join("/");
+        return parsed.toString();
+      } catch (e) {
+        return url;
+      }
+    } else {
+      return url;
+    }
+  };
   let MediaManager$1 = class MediaManager {
     constructor(store, events) {
       this.store = store;
@@ -9372,6 +9374,20 @@ flowchart TD
       try {
         this.events.dispatch({ type: "media:list:start", ...options });
         const media = await this.store.list(options);
+        media.items = media.items.map((item) => {
+          if (item.type === "dir") {
+            return item;
+          }
+          if (item.thumbnails) {
+            for (const [size, src] of Object.entries(item.thumbnails)) {
+              item.thumbnails[size] = encodeUrlIfNeeded(src);
+            }
+          }
+          return {
+            ...item,
+            src: encodeUrlIfNeeded(item.src)
+          };
+        });
         this.events.dispatch({ type: "media:list:success", ...options, media });
         return media;
       } catch (error) {
@@ -10179,7 +10195,7 @@ flowchart TD
       "Event Log"
     ));
   };
-  const version = "2.5.2";
+  const version = "2.6.4";
   const Nav = ({
     isLocalMode,
     className = "",
@@ -14499,7 +14515,7 @@ flowchart TD
         key: template.name,
         onMouseDown: (e) => {
           e.preventDefault();
-          close();
+          setOpen(false);
           insertMDX(editor, template);
         },
         className: ""
@@ -14585,7 +14601,12 @@ flowchart TD
     const [itemsShown, setItemsShown] = React.useState(11);
     const { overrides, templates } = useToolbarContext();
     const showEmbedButton = templates.length > 0;
-    let items2 = overrides === void 0 ? Object.values(toolbarItems) : overrides.map((item) => toolbarItems[item]).filter((item) => item !== void 0);
+    let items2 = [];
+    if (Array.isArray(overrides)) {
+      items2 = overrides === void 0 ? Object.values(toolbarItems) : overrides.map((item) => toolbarItems[item]).filter((item) => item !== void 0);
+    } else {
+      items2 = (overrides == null ? void 0 : overrides.toolbar) === void 0 ? Object.values(toolbarItems) : overrides.toolbar.map((item) => toolbarItems[item]).filter((item) => item !== void 0);
+    }
     if (!showEmbedButton) {
       items2 = items2.filter((item) => item.label !== toolbarItems.embed.label);
     }
@@ -14913,6 +14934,9 @@ flowchart TD
     if (typeof string !== "string") {
       return false;
     }
+    if (string.startsWith("#")) {
+      return true;
+    }
     const generalMatch = string.match(protocolAndDomainRE);
     const emailLinkMatch = string.match(emailLintRE);
     const localUrlMatch = string.match(localUrlRE);
@@ -14934,12 +14958,12 @@ flowchart TD
     }
     return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
   };
-  const RichEditor = (props) => {
+  const RichEditor = ({ input, tinaForm, field }) => {
     var _a;
     const initialValue = React.useMemo(
       () => {
         var _a2, _b;
-        return ((_b = (_a2 = props.input.value) == null ? void 0 : _a2.children) == null ? void 0 : _b.length) ? props.input.value.children.map(helpers.normalize) : [{ type: "p", children: [{ type: "text", text: "" }] }];
+        return ((_b = (_a2 = input.value) == null ? void 0 : _a2.children) == null ? void 0 : _b.length) ? input.value.children.map(helpers.normalize) : [{ type: "p", children: [{ type: "text", text: "" }] }];
       },
       []
     );
@@ -14967,7 +14991,7 @@ flowchart TD
       ),
       []
     );
-    const tempId = [props.tinaForm.id, props.input.name].join(".");
+    const tempId = [tinaForm.id, input.name].join(".");
     const id = React.useMemo(() => uuid() + tempId, [tempId]);
     const ref = React.useRef(null);
     React.useEffect(() => {
@@ -14977,13 +15001,13 @@ flowchart TD
           const plateElement = (_a2 = ref.current) == null ? void 0 : _a2.querySelector(
             '[role="textbox"]'
           );
-          if (props.field.experimental_focusIntent && plateElement) {
+          if (field.experimental_focusIntent && plateElement) {
             if (plateElement)
               plateElement.focus();
           }
         }, 100);
       }
-    }, [props.field.experimental_focusIntent, ref]);
+    }, [field.experimental_focusIntent, ref]);
     return /* @__PURE__ */ React.createElement("div", { ref }, /* @__PURE__ */ React.createElement(
       plateCommon.Plate,
       {
@@ -14991,7 +15015,7 @@ flowchart TD
         initialValue,
         plugins: plugins$2,
         onChange: (value) => {
-          props.input.onChange({
+          input.onChange({
             type: "root",
             children: value
           });
@@ -15000,12 +15024,12 @@ flowchart TD
       /* @__PURE__ */ React.createElement(TooltipProvider, null, /* @__PURE__ */ React.createElement(
         ToolbarProvider,
         {
-          tinaForm: props.tinaForm,
-          templates: props.field.templates,
-          overrides: (_a = props.field) == null ? void 0 : _a.toolbarOverride
+          tinaForm,
+          templates: field.templates,
+          overrides: (field == null ? void 0 : field.toolbarOverride) ? field.toolbarOverride : field.overrides
         },
         /* @__PURE__ */ React.createElement(FixedToolbar, null, /* @__PURE__ */ React.createElement(FixedToolbarButtons, null)),
-        /* @__PURE__ */ React.createElement(FloatingToolbar, null, /* @__PURE__ */ React.createElement(FloatingToolbarButtons, null))
+        ((_a = field == null ? void 0 : field.overrides) == null ? void 0 : _a.showFloatingToolbar) !== false ? /* @__PURE__ */ React.createElement(FloatingToolbar, null, /* @__PURE__ */ React.createElement(FloatingToolbarButtons, null)) : null
       ), /* @__PURE__ */ React.createElement(Editor, null))
     ));
   };
@@ -33085,15 +33109,24 @@ This will work when developing locally but NOT when deployed to production.
           }
         }
         if (state === "creatingPR") {
-          const foo = await tinaApi.createPullRequest({
-            baseBranch,
-            branch,
-            title: `${branch.replace("tina/", "").replace("-", " ")} (PR from TinaCMS)`
-          });
-          console.log("PR created", foo);
-          cms.alerts.success("Pull request created.");
-          localStorage.setItem("tina.createBranchState", "done");
-          setState("done");
+          try {
+            const foo = await tinaApi.createPullRequest({
+              baseBranch,
+              branch,
+              title: `${branch.replace("tina/", "").replace("-", " ")} (PR from TinaCMS)`
+            });
+            console.log("PR created", foo);
+            cms.alerts.success("Pull request created.");
+            localStorage.setItem("tina.createBranchState", "done");
+            setState("done");
+          } catch (e) {
+            console.error(e);
+            cms.alerts.error("Failed to create PR");
+            setErrorMessage(
+              "Failed to create PR, please try again. If the problem persists please contact support."
+            );
+            setState("error");
+          }
         }
         if (state === "done") {
           window.location.href = back;

package/dist/index.mjs

@@ -15,12 +15,12 @@ import { ELEMENT_SLASH_INPUT, createSlashPlugin } from "@udecode/plate-slash-com
 import { useSelected, useReadOnly, ReactEditor } from "slate-react";
 import { useCodeBlockElementState, useCodeSyntaxLeaf, ELEMENT_CODE_BLOCK as ELEMENT_CODE_BLOCK$1 } from "@udecode/plate-code-block";
 import MonacoEditor, { loader, useMonaco } from "@monaco-editor/react";
-import { Combobox, ComboboxInput, ComboboxButton, Transition, ComboboxOptions, ComboboxOption, Popover as Popover$3, PopoverButton, PopoverPanel, TransitionChild, Disclosure, DisclosureButton, DisclosurePanel, Menu, MenuButton, MenuItems, MenuItem } from "@headlessui/react";
+import { Combobox as Combobox$1, ComboboxInput, ComboboxButton, Transition, ComboboxOptions, ComboboxOption, Popover as Popover$3, PopoverButton, PopoverPanel, TransitionChild, Disclosure, DisclosureButton, DisclosurePanel, Menu, MenuButton, MenuItems, MenuItem } from "@headlessui/react";
 import { cva } from "class-variance-authority";
 import { Eye, SquarePen, Plus, AlignCenter as AlignCenter$1, AlignJustify, AlignLeft as AlignLeft$1, AlignRight as AlignRight$1, ChevronDown, PaintBucket, Quote, Check, ChevronRight, ChevronsUpDown, X, FileCode, Baseline, RectangleVertical, Combine, Ungroup, MessageSquare, MessageSquarePlus, Trash, GripVertical, Edit2, Smile, ExternalLink, Heading1, Heading2, Heading3, Heading4, Heading5, Heading6, Indent, Keyboard, WrapText, Minus, MoreHorizontal, Outdent, Pilcrow, RotateCcw, RectangleHorizontal, Search, Settings, Strikethrough, Subscript, Superscript, Table, Text, Underline, Link2Off, Moon, SunMedium, Twitter } from "lucide-react";
 import mermaid from "mermaid";
 import { ELEMENT_H1, ELEMENT_H2, ELEMENT_H3, ELEMENT_H4 as ELEMENT_H4$1, ELEMENT_H5 as ELEMENT_H5$1, ELEMENT_H6 as ELEMENT_H6$1 } from "@udecode/plate-heading";
-import { useComboboxContext, Combobox as Combobox$1, useComboboxStore, ComboboxProvider, Portal, ComboboxPopover, ComboboxItem } from "@ariakit/react";
+import { useComboboxContext, Combobox as Combobox$2, useComboboxStore, ComboboxProvider, Portal, ComboboxPopover, ComboboxItem } from "@ariakit/react";
 import { useHTMLInputCursorState, useComboboxInput, filterWords } from "@udecode/plate-combobox";
 import { useTableCellElementState, useTableCellElement, useTableCellElementResizableState, useTableCellElementResizable, useTableBordersDropdownMenuContentState, useTableMergeState, TableProvider, useTableElementState, useTableElement, mergeTableCells, unmergeTableCells, ELEMENT_TABLE as ELEMENT_TABLE$1, getTableColumnCount, insertTable, deleteTable, insertTableColumn, deleteColumn, insertTableRow, deleteRow } from "@udecode/plate-table";
 import { ResizeHandle as ResizeHandle$1 } from "@udecode/plate-resizable";
@@ -992,7 +992,7 @@ const Autocomplete = ({
     }
   }, [items2, query]);
   return /* @__PURE__ */ React__default.createElement(
-    Combobox,
+    Combobox$1,
     {
       value,
       onChange,
@@ -2173,7 +2173,7 @@ const InlineComboboxInput = forwardRef(({ className, ...props }, propRef) => {
     },
     value || "​"
   ), /* @__PURE__ */ React__default.createElement(
-    Combobox$1,
+    Combobox$2,
     {
       autoSelect: true,
       className: cn$1(
@@ -5224,7 +5224,7 @@ const PopoverContent = React.forwardRef(({ className, align = "center", sideOffs
     side: "bottom",
     className: cn(
       "rounded-md border bg-white p-4 text-popover-foreground shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-      "max-h-[30vh] max-w-[30vh] overflow-y-auto",
+      "max-h-[30vh] max-w-[30vw] overflow-y-auto",
       className
     ),
     ...props
@@ -5316,11 +5316,7 @@ const getFilename = (optionSets, value) => {
   const node = nodes.find((node2) => node2.id === value);
   return node ? node._internalSys.filename : null;
 };
-const ComboboxDemo = ({
-  cms,
-  input,
-  field
-}) => {
+const Combobox = ({ cms, input, field }) => {
   const [open2, setOpen] = React.useState(false);
   const [value, setValue] = React.useState(input.value);
   const [displayText, setDisplayText] = React.useState(null);
@@ -5344,17 +5340,17 @@ const ComboboxDemo = ({
   if (loading === true) {
     return /* @__PURE__ */ React.createElement(LoadingDots, { color: "var(--tina-color-primary)" });
   }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(Popover, { open: open2, onOpenChange: setOpen }, /* @__PURE__ */ React.createElement(PopoverTrigger, { asChild: true }, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(Popover, { open: open2, onOpenChange: setOpen }, /* @__PURE__ */ React.createElement(PopoverTrigger, { asChild: true }, /* @__PURE__ */ React.createElement(
     Button,
     {
       variant: "outline",
       role: "combobox",
       "aria-expanded": open2,
-      className: "w-52 justify-between"
+      className: "w-full justify-between"
     },
     /* @__PURE__ */ React.createElement("p", { className: "truncate" }, displayText ?? "Choose an option..."),
     open2 ? /* @__PURE__ */ React.createElement(IoMdArrowDropup, { size: 20 }) : /* @__PURE__ */ React.createElement(IoMdArrowDropdown, { size: 20 })
-  )), /* @__PURE__ */ React.createElement(PopoverContent, { className: "p-0 relative" }, /* @__PURE__ */ React.createElement(
+  )), /* @__PURE__ */ React.createElement(PopoverContent, { className: "p-0 relative min-w-[var(--radix-popover-trigger-width)]" }, /* @__PURE__ */ React.createElement(
     Command,
     {
       shouldFilter: !field.experimental___filter,
@@ -5378,32 +5374,25 @@ const ComboboxDemo = ({
       }
     ),
     /* @__PURE__ */ React.createElement(CommandEmpty, null, "No reference found"),
-    /* @__PURE__ */ React.createElement(CommandList, null, filteredOptionsList.length > 0 && (filteredOptionsList == null ? void 0 : filteredOptionsList.map(({ collection, edges }) => /* @__PURE__ */ React.createElement(
-      CommandGroup,
-      {
-        key: `${collection}-group`,
-        heading: collection
-      },
-      /* @__PURE__ */ React.createElement(CommandList, null, edges == null ? void 0 : edges.map(({ node }) => {
-        const { id, _values } = node;
-        return /* @__PURE__ */ React.createElement(
-          OptionComponent,
-          {
-            id,
-            key: id,
-            value,
-            field,
-            _values,
-            node,
-            onSelect: (currentValue) => {
-              setValue(currentValue);
-              setOpen(false);
-            }
+    /* @__PURE__ */ React.createElement(CommandList, null, filteredOptionsList.length > 0 && (filteredOptionsList == null ? void 0 : filteredOptionsList.map(({ collection, edges }) => /* @__PURE__ */ React.createElement(CommandGroup, { key: `${collection}-group`, heading: collection }, /* @__PURE__ */ React.createElement(CommandList, null, edges == null ? void 0 : edges.map(({ node }) => {
+      const { id, _values } = node;
+      return /* @__PURE__ */ React.createElement(
+        OptionComponent,
+        {
+          id,
+          key: id,
+          value,
+          field,
+          _values,
+          node,
+          onSelect: (currentValue) => {
+            setValue(currentValue);
+            setOpen(false);
           }
-        );
-      }))
-    ))))
-  ))));
+        }
+      );
+    }))))))
+  )));
 };
 const useGetNode = (cms, id) => {
   const [document2, setDocument] = React.useState(
@@ -5476,7 +5465,7 @@ const ReferenceLink = ({ cms, input }) => {
 };
 const Reference = ({ input, field }) => {
   const cms = useCMS();
-  return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement("div", { className: "relative group" }, /* @__PURE__ */ React.createElement(ComboboxDemo, { cms, input, field })), /* @__PURE__ */ React.createElement(ReferenceLink, { cms, input }));
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", { className: "relative group" }, /* @__PURE__ */ React.createElement(Combobox, { cms, input, field })), /* @__PURE__ */ React.createElement(ReferenceLink, { cms, input }));
 };
 const ButtonToggle = ({
   input,
@@ -9327,6 +9316,19 @@ class TinaMediaStore {
     }
   }
 }
+const encodeUrlIfNeeded = (url) => {
+  if (url) {
+    try {
+      const parsed = new URL(url);
+      parsed.pathname = parsed.pathname.split("/").filter((part) => part !== "").map(encodeURIComponent).join("/");
+      return parsed.toString();
+    } catch (e) {
+      return url;
+    }
+  } else {
+    return url;
+  }
+};
 let MediaManager$1 = class MediaManager {
   constructor(store, events) {
     this.store = store;
@@ -9399,6 +9401,20 @@ let MediaManager$1 = class MediaManager {
     try {
       this.events.dispatch({ type: "media:list:start", ...options });
       const media = await this.store.list(options);
+      media.items = media.items.map((item) => {
+        if (item.type === "dir") {
+          return item;
+        }
+        if (item.thumbnails) {
+          for (const [size, src] of Object.entries(item.thumbnails)) {
+            item.thumbnails[size] = encodeUrlIfNeeded(src);
+          }
+        }
+        return {
+          ...item,
+          src: encodeUrlIfNeeded(item.src)
+        };
+      });
       this.events.dispatch({ type: "media:list:success", ...options, media });
       return media;
     } catch (error) {
@@ -10206,7 +10222,7 @@ const SyncStatus = ({ cms, setEventsOpen }) => {
     "Event Log"
   ));
 };
-const version = "2.5.2";
+const version = "2.6.4";
 const Nav = ({
   isLocalMode,
   className = "",
@@ -14526,7 +14542,7 @@ const EmbedButton = ({ editor, templates }) => {
       key: template.name,
       onMouseDown: (e) => {
         e.preventDefault();
-        close();
+        setOpen(false);
         insertMDX(editor, template);
       },
       className: ""
@@ -14612,7 +14628,12 @@ function FixedToolbarButtons() {
   const [itemsShown, setItemsShown] = React__default.useState(11);
   const { overrides, templates } = useToolbarContext();
   const showEmbedButton = templates.length > 0;
-  let items2 = overrides === void 0 ? Object.values(toolbarItems) : overrides.map((item) => toolbarItems[item]).filter((item) => item !== void 0);
+  let items2 = [];
+  if (Array.isArray(overrides)) {
+    items2 = overrides === void 0 ? Object.values(toolbarItems) : overrides.map((item) => toolbarItems[item]).filter((item) => item !== void 0);
+  } else {
+    items2 = (overrides == null ? void 0 : overrides.toolbar) === void 0 ? Object.values(toolbarItems) : overrides.toolbar.map((item) => toolbarItems[item]).filter((item) => item !== void 0);
+  }
   if (!showEmbedButton) {
     items2 = items2.filter((item) => item.label !== toolbarItems.embed.label);
   }
@@ -14940,6 +14961,9 @@ const isUrl = (string) => {
   if (typeof string !== "string") {
     return false;
   }
+  if (string.startsWith("#")) {
+    return true;
+  }
   const generalMatch = string.match(protocolAndDomainRE);
   const emailLinkMatch = string.match(emailLintRE);
   const localUrlMatch = string.match(localUrlRE);
@@ -14961,12 +14985,12 @@ const isUrl = (string) => {
   }
   return localhostDomainRE.test(everythingAfterProtocol) || nonLocalhostDomainRE.test(everythingAfterProtocol);
 };
-const RichEditor = (props) => {
+const RichEditor = ({ input, tinaForm, field }) => {
   var _a;
   const initialValue = React__default.useMemo(
     () => {
       var _a2, _b;
-      return ((_b = (_a2 = props.input.value) == null ? void 0 : _a2.children) == null ? void 0 : _b.length) ? props.input.value.children.map(helpers.normalize) : [{ type: "p", children: [{ type: "text", text: "" }] }];
+      return ((_b = (_a2 = input.value) == null ? void 0 : _a2.children) == null ? void 0 : _b.length) ? input.value.children.map(helpers.normalize) : [{ type: "p", children: [{ type: "text", text: "" }] }];
     },
     []
   );
@@ -14994,7 +15018,7 @@ const RichEditor = (props) => {
     ),
     []
   );
-  const tempId = [props.tinaForm.id, props.input.name].join(".");
+  const tempId = [tinaForm.id, input.name].join(".");
   const id = React__default.useMemo(() => uuid() + tempId, [tempId]);
   const ref = React__default.useRef(null);
   React__default.useEffect(() => {
@@ -15004,13 +15028,13 @@ const RichEditor = (props) => {
         const plateElement = (_a2 = ref.current) == null ? void 0 : _a2.querySelector(
           '[role="textbox"]'
         );
-        if (props.field.experimental_focusIntent && plateElement) {
+        if (field.experimental_focusIntent && plateElement) {
           if (plateElement)
             plateElement.focus();
         }
       }, 100);
     }
-  }, [props.field.experimental_focusIntent, ref]);
+  }, [field.experimental_focusIntent, ref]);
   return /* @__PURE__ */ React__default.createElement("div", { ref }, /* @__PURE__ */ React__default.createElement(
     Plate,
     {
@@ -15018,7 +15042,7 @@ const RichEditor = (props) => {
       initialValue,
       plugins: plugins$2,
       onChange: (value) => {
-        props.input.onChange({
+        input.onChange({
           type: "root",
           children: value
         });
@@ -15027,12 +15051,12 @@ const RichEditor = (props) => {
     /* @__PURE__ */ React__default.createElement(TooltipProvider, null, /* @__PURE__ */ React__default.createElement(
       ToolbarProvider,
       {
-        tinaForm: props.tinaForm,
-        templates: props.field.templates,
-        overrides: (_a = props.field) == null ? void 0 : _a.toolbarOverride
+        tinaForm,
+        templates: field.templates,
+        overrides: (field == null ? void 0 : field.toolbarOverride) ? field.toolbarOverride : field.overrides
       },
       /* @__PURE__ */ React__default.createElement(FixedToolbar, null, /* @__PURE__ */ React__default.createElement(FixedToolbarButtons, null)),
-      /* @__PURE__ */ React__default.createElement(FloatingToolbar, null, /* @__PURE__ */ React__default.createElement(FloatingToolbarButtons, null))
+      ((_a = field == null ? void 0 : field.overrides) == null ? void 0 : _a.showFloatingToolbar) !== false ? /* @__PURE__ */ React__default.createElement(FloatingToolbar, null, /* @__PURE__ */ React__default.createElement(FloatingToolbarButtons, null)) : null
     ), /* @__PURE__ */ React__default.createElement(Editor, null))
   ));
 };
@@ -33112,15 +33136,24 @@ const IndexingPage = () => {
         }
       }
       if (state === "creatingPR") {
-        const foo = await tinaApi.createPullRequest({
-          baseBranch,
-          branch,
-          title: `${branch.replace("tina/", "").replace("-", " ")} (PR from TinaCMS)`
-        });
-        console.log("PR created", foo);
-        cms.alerts.success("Pull request created.");
-        localStorage.setItem("tina.createBranchState", "done");
-        setState("done");
+        try {
+          const foo = await tinaApi.createPullRequest({
+            baseBranch,
+            branch,
+            title: `${branch.replace("tina/", "").replace("-", " ")} (PR from TinaCMS)`
+          });
+          console.log("PR created", foo);
+          cms.alerts.success("Pull request created.");
+          localStorage.setItem("tina.createBranchState", "done");
+          setState("done");
+        } catch (e) {
+          console.error(e);
+          cms.alerts.error("Failed to create PR");
+          setErrorMessage(
+            "Failed to create PR, please try again. If the problem persists please contact support."
+          );
+          setState("error");
+        }
       }
       if (state === "done") {
         window.location.href = back;

package/dist/{node-cache-4c336858.mjs → node-cache-5e8db9f0.mjs}

@@ -25,22 +25,35 @@ const NodeCache = async (dir) => {
       return createHash("sha256").update(input).digest("hex");
     },
     get: async (key) => {
+      let readValue;
+      const cacheFilename = `${cacheDir}/${key}`;
       try {
-        const data = await fs.promises.readFile(`${cacheDir}/${key}`, "utf-8");
-        return JSON.parse(data);
+        const data = await fs.promises.readFile(cacheFilename, "utf-8");
+        readValue = JSON.parse(data);
       } catch (e) {
-        if (e.code === "ENOENT") {
-          return void 0;
+        if (e.code !== "ENOENT") {
+          console.error(
+            `Failed to read cache file to ${cacheFilename}: ${e.message}`
+          );
         }
-        throw e;
       }
+      return readValue;
     },
     set: async (key, value) => {
-      await fs.promises.writeFile(
-        `${cacheDir}/${key}`,
-        JSON.stringify(value),
-        "utf-8"
-      );
+      const cacheFilename = `${cacheDir}/${key}`;
+      try {
+        await fs.promises.writeFile(cacheFilename, JSON.stringify(value), {
+          encoding: "utf-8",
+          flag: "wx"
+          // Don't overwrite existing caches
+        });
+      } catch (e) {
+        if (e.code !== "EEXIST") {
+          console.error(
+            `Failed to write cache file to ${cacheFilename}: ${e.message}`
+          );
+        }
+      }
     }
   };
 };

package/dist/toolkit/fields/components/reference/reference-select.d.ts

@@ -7,5 +7,5 @@ interface ReferenceSelectProps {
     input: any;
     field: ReferenceFieldProps & Field;
 }
-declare const ComboboxDemo: React.FC<ReferenceSelectProps>;
-export default ComboboxDemo;
+declare const Combobox: React.FC<ReferenceSelectProps>;
+export default Combobox;

package/dist/toolkit/fields/plugins/mdx-field-plugin/index.d.ts

@@ -2,16 +2,18 @@ import React from 'react';
 import { type InputFieldType } from '../wrap-field-with-meta';
 import type { MdxTemplate } from './plate/types';
 import type { InputProps } from '../../../fields/components';
-import type { ToolbarOverrideType } from './plate/toolbar/toolbar-overrides';
+import type { ToolbarOverrides, ToolbarOverrideType } from './plate/toolbar/toolbar-overrides';
 export type RichTextType = React.PropsWithChildren<InputFieldType<InputProps, {
     templates: MdxTemplate[];
     toolbarOverride?: ToolbarOverrideType[];
+    overrides?: ToolbarOverrides;
 }>>;
 export declare const MdxFieldPlugin: {
     name: string;
     Component: (props: InputFieldType<InputProps, {
         templates: MdxTemplate[];
         toolbarOverride?: ToolbarOverrideType[];
+        overrides?: ToolbarOverrides;
     }>) => React.JSX.Element;
 };
 export declare const MdxFieldPluginExtendible: {
@@ -20,5 +22,6 @@ export declare const MdxFieldPluginExtendible: {
     Component: (props: InputFieldType<InputProps, {
         templates: MdxTemplate[];
         toolbarOverride?: ToolbarOverrideType[];
+        overrides?: ToolbarOverrides;
     }>) => React.JSX.Element;
 };

package/dist/toolkit/fields/plugins/mdx-field-plugin/plate/index.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import type { RichTextType } from '..';
-export declare const RichEditor: (props: RichTextType) => React.JSX.Element;
+export declare const RichEditor: ({ input, tinaForm, field }: RichTextType) => React.JSX.Element;

package/dist/toolkit/fields/plugins/mdx-field-plugin/plate/toolbar/toolbar-overrides.d.ts

@@ -6,3 +6,7 @@ export declare const EMBED_ICON_WIDTH = 78;
 export declare const CONTAINER_MD_BREAKPOINT = 448;
 export declare const FLOAT_BUTTON_WIDTH = 25;
 export declare const HEADING_LABEL = "Headings";
+export type ToolbarOverrides = {
+    toolbar?: ToolbarOverrideType[];
+    showFloatingToolbar?: boolean;
+};

package/dist/toolkit/fields/plugins/mdx-field-plugin/plate/toolbar/toolbar-provider.d.ts

@@ -2,11 +2,11 @@ import React from 'react';
 import { type ReactNode } from 'react';
 import type { Form } from '../../../../../forms';
 import type { MdxTemplate } from '../types';
-import type { ToolbarOverrideType } from './toolbar-overrides';
+import type { ToolbarOverrides, ToolbarOverrideType } from './toolbar-overrides';
 interface ToolbarContextProps {
     tinaForm: Form;
     templates: MdxTemplate[];
-    overrides: ToolbarOverrideType[];
+    overrides: ToolbarOverrideType[] | ToolbarOverrides;
 }
 interface ToolbarProviderProps extends ToolbarContextProps {
     children: ReactNode;

package/dist/unifiedClient/index.d.ts

@@ -1,3 +1,5 @@
+import AsyncLock from 'async-lock';
+import type { GraphQLError } from 'graphql';
 import type { Config } from '@tinacms/schema-tools';
 import type { Cache } from '../cache/index';
 export declare const TINA_HOST = "content.tinajs.io";
@@ -25,12 +27,17 @@ export declare class TinaClient<GenQueries> {
     queries: GenQueries;
     errorPolicy: Config['client']['errorPolicy'];
     initialized: boolean;
+    cacheLock: AsyncLock | undefined;
     cacheDir: string;
     cache: Cache;
     constructor({ token, url, queries, errorPolicy, cacheDir, }: TinaClientArgs<GenQueries>);
     init(): Promise<void>;
     request<DataType extends Record<string, any> = any>({ errorPolicy, ...args }: TinaClientRequestArgs, options: {
         fetchOptions?: Parameters<typeof fetch>[1];
-    }): Promise<any>;
+    }): Promise<{
+        data: DataType;
+        errors: GraphQLError[] | null;
+        query: string;
+    }>;
 }
 export declare function createClient<GenQueries>(args: TinaClientArgs<GenQueries>): TinaClient<GenQueries>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.0.0-d7c745e-20250102002342",
+  "version": "0.0.0-d9672bc-20250218033222",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -92,6 +92,7 @@
     "@udecode/plate-resizable": "36.0.0",
     "@udecode/plate-slash-command": "^36.0.0",
     "@udecode/plate-table": "36.5.8",
+    "async-lock": "^1.4.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^1.0.4",
@@ -128,9 +129,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/mdx": "0.0.0-d7c745e-20250102002342",
-    "@tinacms/schema-tools": "1.6.9",
-    "@tinacms/search": "0.0.0-d7c745e-20250102002342"
+    "@tinacms/mdx": "0.0.0-d9672bc-20250218033222",
+    "@tinacms/schema-tools": "0.0.0-d9672bc-20250218033222",
+    "@tinacms/search": "0.0.0-d9672bc-20250218033222"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.5.6",