tinacms 2.3.0 → 2.4.0

package/dist/cache/node-cache.d.ts

@@ -1,2 +1,3 @@
 import type { Cache } from './index';
+export declare const makeCacheDir: (dir: string, fs: any, path: any, os: any) => Promise<string>;
 export declare const NodeCache: (dir: string) => Promise<Cache>;

package/dist/client.js

@@ -105,21 +105,27 @@
     const client = new TinaClient(args);
     return client;
   }
-  const makeCacheDir = async (dir, fs) => {
-    const path = await Promise.resolve().then(() => __viteBrowserExternal$1);
-    const os = await Promise.resolve().then(() => __viteBrowserExternal$1);
-    const parts = dir.split(path.sep).filter(Boolean);
+  const makeCacheDir = async (dir, fs, path, os) => {
+    const pathParts = dir.split(path.sep).filter(Boolean);
+    const cacheHash = pathParts[pathParts.length - 1];
+    const rootUser = pathParts[0];
     let cacheDir = dir;
-    if (!fs.existsSync(path.join(path.sep, parts[0]))) {
-      cacheDir = path.join(os.tmpdir(), parts[parts.length - 1]);
+    if (!fs.existsSync(path.join(path.sep, rootUser))) {
+      cacheDir = path.join(os.tmpdir(), cacheHash);
+    }
+    try {
+      fs.mkdirSync(cacheDir, { recursive: true });
+    } catch (error) {
+      throw new Error(`Failed to create cache directory: ${error.message}`);
     }
-    fs.mkdirSync(cacheDir, { recursive: true });
     return cacheDir;
   };
   const NodeCache = async (dir) => {
-    const fs = await Promise.resolve().then(() => __viteBrowserExternal$1);
-    const { createHash } = await Promise.resolve().then(() => __viteBrowserExternal$1);
-    const cacheDir = await makeCacheDir(dir, fs);
+    const fs = require("node:fs");
+    const path = require("node:path");
+    const os = require("node:os");
+    const { createHash } = require("node:crypto");
+    const cacheDir = await makeCacheDir(dir, fs, path, os);
     return {
       makeKey: (key) => {
         const input = key && key instanceof Object ? JSON.stringify(key) : key || "";
@@ -147,12 +153,8 @@
   };
   const nodeCache = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
     __proto__: null,
-    NodeCache
-  }, Symbol.toStringTag, { value: "Module" }));
-  const __viteBrowserExternal = {};
-  const __viteBrowserExternal$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-    __proto__: null,
-    default: __viteBrowserExternal
+    NodeCache,
+    makeCacheDir
   }, Symbol.toStringTag, { value: "Module" }));
   exports2.TINA_HOST = TINA_HOST;
   exports2.TinaClient = TinaClient;

package/dist/client.mjs

@@ -24,7 +24,7 @@ class TinaClient {
     }
     try {
       if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
-        const { NodeCache } = await import("./node-cache-7fa2452c.mjs");
+        const { NodeCache } = await import("./node-cache-4c336858.mjs");
         this.cache = await NodeCache(this.cacheDir);
       }
     } catch (e) {

package/dist/index.js

@@ -774,6 +774,22 @@ var __publicField = (obj, key, value) => {
       );
     };
   }
+  function wrapFieldWithNoHeader(Field) {
+    return (props) => {
+      return /* @__PURE__ */ React__namespace.createElement(
+        FieldMeta,
+        {
+          name: props.input.name,
+          label: false,
+          description: "",
+          error: props.meta.error,
+          index: props.index,
+          tinaForm: props.tinaForm
+        },
+        /* @__PURE__ */ React__namespace.createElement(Field, { ...props })
+      );
+    };
+  }
   function wrapFieldWithError(Field) {
     return (props) => {
       return /* @__PURE__ */ React__namespace.createElement(
@@ -850,9 +866,9 @@ var __publicField = (obj, key, value) => {
       "span",
       {
         className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0 ${className}`,
-        ...props
-      },
-      children
+        ...props,
+        dangerouslySetInnerHTML: { __html: children }
+      }
     );
   };
   const FieldError = ({
@@ -3676,7 +3692,7 @@ flowchart TD
     };
     const sizeClasses = {
       small: `text-xs h-8 px-3`,
-      medium: `text-sm h-10 px-4`,
+      medium: `text-sm h-10 px-8`,
       custom: ``
     };
     return /* @__PURE__ */ React__namespace.createElement(
@@ -5791,27 +5807,35 @@ flowchart TD
       ))))
     ))));
   };
-  const Group = wrapFieldWithError(({ tinaForm, field }) => {
-    const cms = useCMS$1();
-    React__namespace.useState(false);
-    return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, /* @__PURE__ */ React__namespace.createElement(
-      Header,
-      {
-        onClick: () => {
-          const state = tinaForm.finalForm.getState();
-          if (state.invalid === true) {
-            cms.alerts.error("Cannot navigate away from an invalid form.");
-            return;
+  const Group = wrapFieldWithNoHeader(
+    ({ tinaForm, field }) => {
+      const cms = useCMS$1();
+      return /* @__PURE__ */ React__namespace.createElement(React__namespace.Fragment, null, /* @__PURE__ */ React__namespace.createElement(
+        Header,
+        {
+          onClick: () => {
+            const state = tinaForm.finalForm.getState();
+            if (state.invalid === true) {
+              cms.alerts.error("Cannot navigate away from an invalid form.");
+              return;
+            }
+            cms.dispatch({
+              type: "forms:set-active-field-name",
+              value: { formId: tinaForm.id, fieldName: field.name }
+            });
           }
-          cms.dispatch({
-            type: "forms:set-active-field-name",
-            value: { formId: tinaForm.id, fieldName: field.name }
-          });
-        }
-      },
-      field.label || field.name
-    ));
-  });
+        },
+        field.label || field.name,
+        field.description && /* @__PURE__ */ React__namespace.createElement(
+          "span",
+          {
+            className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0`,
+            dangerouslySetInnerHTML: { __html: field.description }
+          }
+        )
+      ));
+    }
+  );
   const Header = ({ onClick, children }) => {
     return /* @__PURE__ */ React__namespace.createElement("div", { className: "pt-1 mb-5" }, /* @__PURE__ */ React__namespace.createElement(
       "button",
@@ -10308,7 +10332,7 @@ flowchart TD
       "Event Log"
     ));
   };
-  const version = "2.3.0";
+  const version = "2.4.0";
   const Nav = ({
     isLocalMode,
     className = "",
@@ -12839,15 +12863,14 @@ flowchart TD
               fields: fieldGroup.fields
             }
           ) : /* @__PURE__ */ React__namespace.createElement(NoFieldsPlaceholder, null)
-        )), !hideFooter && /* @__PURE__ */ React__namespace.createElement("div", { className: "relative flex-none w-full h-16 px-6 bg-white border-t border-gray-100	flex items-center justify-center" }, /* @__PURE__ */ React__namespace.createElement("div", { className: "flex-1 w-full flex justify-between gap-4 items-center max-w-form" }, tinaForm.reset && /* @__PURE__ */ React__namespace.createElement(
+        )), !hideFooter && /* @__PURE__ */ React__namespace.createElement("div", { className: "relative flex-none w-full h-16 px-12 bg-white border-t border-gray-100 flex items-center justify-end" }, /* @__PURE__ */ React__namespace.createElement("div", { className: "flex-1 w-full justify-end gap-2	flex items-center max-w-form" }, tinaForm.reset && /* @__PURE__ */ React__namespace.createElement(
           ResetForm,
           {
             pristine,
             reset: async () => {
               finalForm2.reset();
               await tinaForm.reset();
-            },
-            style: { flexGrow: 1 }
+            }
           },
           tinaForm.buttons.reset
         ), /* @__PURE__ */ React__namespace.createElement(
@@ -12856,8 +12879,7 @@ flowchart TD
             onClick: safeHandleSubmit,
             disabled: !canSubmit,
             busy: submitting,
-            variant: "primary",
-            style: { flexGrow: 3 }
+            variant: "primary"
           },
           submitting && /* @__PURE__ */ React__namespace.createElement(LoadingDots, null),
           !submitting && tinaForm.buttons.save
@@ -14427,6 +14449,7 @@ flowchart TD
       ToolbarButton,
       {
         showArrow: false,
+        "data-testid": "rich-text-editor-overflow-menu-button",
         className: "lg:min-w-[130px]",
         isDropdown: true,
         pressed: openState.open,
@@ -14480,7 +14503,17 @@ flowchart TD
   };
   const RawMarkdownToolbarButton = cn$1.withRef(({ clear, ...rest }, ref) => {
     const { props } = useRawMarkdownToolbarButton();
-    return /* @__PURE__ */ React.createElement(ToolbarButton, { ref, tooltip: "Link", ...rest, ...props }, /* @__PURE__ */ React.createElement(Icons.raw, null));
+    return /* @__PURE__ */ React.createElement(
+      ToolbarButton,
+      {
+        ref,
+        tooltip: "Link",
+        ...rest,
+        ...props,
+        "data-testid": "markdown-button"
+      },
+      /* @__PURE__ */ React.createElement(Icons.raw, null)
+    );
   });
   function TableDropdownMenu(props) {
     const tableSelected = plateCommon.useEditorSelector(
@@ -33796,6 +33829,7 @@ This will work when developing locally but NOT when deployed to production.
   exports2.useScreenPlugin = useScreenPlugin;
   exports2.useTinaAuthRedirect = useTinaAuthRedirect;
   exports2.wrapFieldWithError = wrapFieldWithError;
+  exports2.wrapFieldWithNoHeader = wrapFieldWithNoHeader;
   exports2.wrapFieldsWithMeta = wrapFieldsWithMeta;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });

package/dist/index.mjs

@@ -801,6 +801,22 @@ function wrapFieldsWithMeta(Field2) {
     );
   };
 }
+function wrapFieldWithNoHeader(Field2) {
+  return (props) => {
+    return /* @__PURE__ */ React.createElement(
+      FieldMeta,
+      {
+        name: props.input.name,
+        label: false,
+        description: "",
+        error: props.meta.error,
+        index: props.index,
+        tinaForm: props.tinaForm
+      },
+      /* @__PURE__ */ React.createElement(Field2, { ...props })
+    );
+  };
+}
 function wrapFieldWithError(Field2) {
   return (props) => {
     return /* @__PURE__ */ React.createElement(
@@ -877,9 +893,9 @@ const FieldDescription = ({
     "span",
     {
       className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0 ${className}`,
-      ...props
-    },
-    children
+      ...props,
+      dangerouslySetInnerHTML: { __html: children }
+    }
   );
 };
 const FieldError = ({
@@ -3703,7 +3719,7 @@ const Button$1 = ({
   };
   const sizeClasses = {
     small: `text-xs h-8 px-3`,
-    medium: `text-sm h-10 px-4`,
+    medium: `text-sm h-10 px-8`,
     custom: ``
   };
   return /* @__PURE__ */ React.createElement(
@@ -5818,27 +5834,35 @@ const BlockSelector = ({
     ))))
   ))));
 };
-const Group = wrapFieldWithError(({ tinaForm, field }) => {
-  const cms = useCMS$1();
-  React.useState(false);
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
-    Header,
-    {
-      onClick: () => {
-        const state = tinaForm.finalForm.getState();
-        if (state.invalid === true) {
-          cms.alerts.error("Cannot navigate away from an invalid form.");
-          return;
+const Group = wrapFieldWithNoHeader(
+  ({ tinaForm, field }) => {
+    const cms = useCMS$1();
+    return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(
+      Header,
+      {
+        onClick: () => {
+          const state = tinaForm.finalForm.getState();
+          if (state.invalid === true) {
+            cms.alerts.error("Cannot navigate away from an invalid form.");
+            return;
+          }
+          cms.dispatch({
+            type: "forms:set-active-field-name",
+            value: { formId: tinaForm.id, fieldName: field.name }
+          });
         }
-        cms.dispatch({
-          type: "forms:set-active-field-name",
-          value: { formId: tinaForm.id, fieldName: field.name }
-        });
-      }
-    },
-    field.label || field.name
-  ));
-});
+      },
+      field.label || field.name,
+      field.description && /* @__PURE__ */ React.createElement(
+        "span",
+        {
+          className: `block font-sans text-xs italic font-light text-gray-400 pt-0.5 whitespace-normal m-0`,
+          dangerouslySetInnerHTML: { __html: field.description }
+        }
+      )
+    ));
+  }
+);
 const Header = ({ onClick, children }) => {
   return /* @__PURE__ */ React.createElement("div", { className: "pt-1 mb-5" }, /* @__PURE__ */ React.createElement(
     "button",
@@ -10335,7 +10359,7 @@ const SyncStatus = ({ cms, setEventsOpen }) => {
     "Event Log"
   ));
 };
-const version = "2.3.0";
+const version = "2.4.0";
 const Nav = ({
   isLocalMode,
   className = "",
@@ -12866,15 +12890,14 @@ const FormBuilder = ({
             fields: fieldGroup.fields
           }
         ) : /* @__PURE__ */ React.createElement(NoFieldsPlaceholder, null)
-      )), !hideFooter && /* @__PURE__ */ React.createElement("div", { className: "relative flex-none w-full h-16 px-6 bg-white border-t border-gray-100	flex items-center justify-center" }, /* @__PURE__ */ React.createElement("div", { className: "flex-1 w-full flex justify-between gap-4 items-center max-w-form" }, tinaForm.reset && /* @__PURE__ */ React.createElement(
+      )), !hideFooter && /* @__PURE__ */ React.createElement("div", { className: "relative flex-none w-full h-16 px-12 bg-white border-t border-gray-100 flex items-center justify-end" }, /* @__PURE__ */ React.createElement("div", { className: "flex-1 w-full justify-end gap-2	flex items-center max-w-form" }, tinaForm.reset && /* @__PURE__ */ React.createElement(
         ResetForm,
         {
           pristine,
           reset: async () => {
             finalForm.reset();
             await tinaForm.reset();
-          },
-          style: { flexGrow: 1 }
+          }
         },
         tinaForm.buttons.reset
       ), /* @__PURE__ */ React.createElement(
@@ -12883,8 +12906,7 @@ const FormBuilder = ({
           onClick: safeHandleSubmit,
           disabled: !canSubmit,
           busy: submitting,
-          variant: "primary",
-          style: { flexGrow: 3 }
+          variant: "primary"
         },
         submitting && /* @__PURE__ */ React.createElement(LoadingDots, null),
         !submitting && tinaForm.buttons.save
@@ -14454,6 +14476,7 @@ function OverflowMenu({
     ToolbarButton,
     {
       showArrow: false,
+      "data-testid": "rich-text-editor-overflow-menu-button",
       className: "lg:min-w-[130px]",
       isDropdown: true,
       pressed: openState.open,
@@ -14507,7 +14530,17 @@ const useRawMarkdownToolbarButton = () => {
 };
 const RawMarkdownToolbarButton = withRef(({ clear, ...rest }, ref) => {
   const { props } = useRawMarkdownToolbarButton();
-  return /* @__PURE__ */ React__default.createElement(ToolbarButton, { ref, tooltip: "Link", ...rest, ...props }, /* @__PURE__ */ React__default.createElement(Icons.raw, null));
+  return /* @__PURE__ */ React__default.createElement(
+    ToolbarButton,
+    {
+      ref,
+      tooltip: "Link",
+      ...rest,
+      ...props,
+      "data-testid": "markdown-button"
+    },
+    /* @__PURE__ */ React__default.createElement(Icons.raw, null)
+  );
 });
 function TableDropdownMenu(props) {
   const tableSelected = useEditorSelector(
@@ -33818,5 +33851,6 @@ export {
   useScreenPlugin,
   useTinaAuthRedirect,
   wrapFieldWithError,
+  wrapFieldWithNoHeader,
   wrapFieldsWithMeta
 };

package/dist/{node-cache-7fa2452c.mjs → node-cache-4c336858.mjs}

@@ -1,18 +1,24 @@
-const makeCacheDir = async (dir, fs) => {
-  const path = await import("./__vite-browser-external-d06ac358.mjs");
-  const os = await import("./__vite-browser-external-d06ac358.mjs");
-  const parts = dir.split(path.sep).filter(Boolean);
+const makeCacheDir = async (dir, fs, path, os) => {
+  const pathParts = dir.split(path.sep).filter(Boolean);
+  const cacheHash = pathParts[pathParts.length - 1];
+  const rootUser = pathParts[0];
   let cacheDir = dir;
-  if (!fs.existsSync(path.join(path.sep, parts[0]))) {
-    cacheDir = path.join(os.tmpdir(), parts[parts.length - 1]);
+  if (!fs.existsSync(path.join(path.sep, rootUser))) {
+    cacheDir = path.join(os.tmpdir(), cacheHash);
+  }
+  try {
+    fs.mkdirSync(cacheDir, { recursive: true });
+  } catch (error) {
+    throw new Error(`Failed to create cache directory: ${error.message}`);
   }
-  fs.mkdirSync(cacheDir, { recursive: true });
   return cacheDir;
 };
 const NodeCache = async (dir) => {
-  const fs = await import("./__vite-browser-external-d06ac358.mjs");
-  const { createHash } = await import("./__vite-browser-external-d06ac358.mjs");
-  const cacheDir = await makeCacheDir(dir, fs);
+  const fs = require("node:fs");
+  const path = require("node:path");
+  const os = require("node:os");
+  const { createHash } = require("node:crypto");
+  const cacheDir = await makeCacheDir(dir, fs, path, os);
   return {
     makeKey: (key) => {
       const input = key && key instanceof Object ? JSON.stringify(key) : key || "";
@@ -39,5 +45,6 @@ const NodeCache = async (dir) => {
   };
 };
 export {
-  NodeCache
+  NodeCache,
+  makeCacheDir
 };

package/dist/toolkit/fields/plugins/wrap-field-with-meta.d.ts

@@ -3,6 +3,14 @@ import { FieldProps } from './field-props';
 import { Form } from '../../forms';
 export type InputFieldType<ExtraFieldProps, InputProps> = FieldProps<InputProps> & ExtraFieldProps;
 export declare function wrapFieldsWithMeta<ExtraFieldProps = {}, InputProps = {}>(Field: React.FunctionComponent<InputFieldType<ExtraFieldProps, InputProps>> | React.ComponentClass<InputFieldType<ExtraFieldProps, InputProps>>): (props: InputFieldType<ExtraFieldProps, InputProps>) => React.JSX.Element;
+/**
+ * Same as wrapFieldsWithMeta but excludes the label, and description useful for fields that render their label and description
+ */
+export declare function wrapFieldWithNoHeader<ExtraFieldProps = {}, InputProps = {}>(Field: React.FunctionComponent<InputFieldType<ExtraFieldProps, InputProps>> | React.ComponentClass<InputFieldType<ExtraFieldProps, InputProps>>): (props: InputFieldType<ExtraFieldProps, InputProps>) => React.JSX.Element;
+/**
+ * Same as above but excludes the label, useful for fields that have their own label
+ * @deprecated This function is deprecated and will be removed in future versions.
+ */
 export declare function wrapFieldWithError<ExtraFieldProps = {}, InputProps = {}>(Field: React.FunctionComponent<InputFieldType<ExtraFieldProps, InputProps>> | React.ComponentClass<InputFieldType<ExtraFieldProps, InputProps>>): (props: InputFieldType<ExtraFieldProps, InputProps>) => React.JSX.Element;
 interface FieldMetaProps extends React.HTMLAttributes<HTMLElement> {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -129,9 +129,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/mdx": "1.5.0",
-    "@tinacms/schema-tools": "1.6.6",
-    "@tinacms/search": "1.0.33"
+    "@tinacms/mdx": "1.5.1",
+    "@tinacms/schema-tools": "1.6.7",
+    "@tinacms/search": "1.0.34"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.5.4",

package/dist/__vite-browser-external-d06ac358.mjs

@@ -1,4 +0,0 @@
-const __viteBrowserExternal = {};
-export {
-  __viteBrowserExternal as default
-};