tinacms 0.68.15 → 0.69.2

package/dist/index.d.ts

@@ -20,7 +20,8 @@ export * from '@tinacms/toolkit';
 export { TinaAdmin } from './admin';
 export { RouteMappingPlugin } from './admin/plugins/route-mapping';
 export { TinaAdminApi } from './admin/api';
-import { TinaCMSProvider2, TinaCMSProviderDefaultProps } from './tina-cms';
+import { TinaCMSProvider2 } from './tina-cms';
+import type { TinaCMSProviderDefaultProps } from './types/cms';
 export type { TinaCMSProviderDefaultProps };
 export default TinaCMSProvider2;
 import type { TinaCloudSchema as TinaCloudSchemaBase, TinaCloudCollection as TinaCloudCollectionBase, TinaCloudTemplateBase as TinaTemplate, TinaFieldBase } from '@tinacms/schema-tools';

package/dist/index.es.js

@@ -1175,7 +1175,8 @@ const formify = async ({
                 return formifyInlineFragmentNode({
                   inlineFragmentNode: selectionNode,
                   parentType: type,
-                  path
+                  path,
+                  showInSidebar: true
                 });
               }
               case "Field": {
@@ -1245,7 +1246,8 @@ const formify = async ({
                 return formifyInlineFragmentNode({
                   inlineFragmentNode: selectionNode,
                   parentType: field.type,
-                  path: fieldPath
+                  path: fieldPath,
+                  showInSidebar: false
                 });
               }
               default:
@@ -1259,7 +1261,8 @@ const formify = async ({
   const formifyInlineFragmentNode = ({
     inlineFragmentNode,
     parentType,
-    path
+    path,
+    showInSidebar
   }) => {
     const type = getSelectedUnionType(parentType, inlineFragmentNode);
     if (!type) {
@@ -1270,7 +1273,7 @@ const formify = async ({
         inlineFragmentNode,
         type,
         path,
-        showInSidebar: false
+        showInSidebar
       });
     }
     return {
@@ -3854,9 +3857,9 @@ const useDocumentCreatorPlugin = (args) => {
                 }
                 return true;
               }
-              const isValid = /^[_a-zA-Z][-,_a-zA-Z0-9]*$/.test(value);
+              const isValid = /^[_a-zA-Z0-9][\-_a-zA-Z0-9]*$/.test(value);
               if (value && !isValid) {
-                return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, - or _";
+                return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, - or _";
               }
             }
           }
@@ -4016,16 +4019,18 @@ const TinaCMSProvider2 = ({
   ...props
 }) => {
   var _a;
-  const validOldSetup = new Boolean(props == null ? void 0 : props.isLocalClient) || new Boolean(props == null ? void 0 : props.clientId) && new Boolean(props == null ? void 0 : props.branch);
-  const apiURL = ((_a = props == null ? void 0 : props.client) == null ? void 0 : _a.apiUrl) || (props == null ? void 0 : props.apiURL);
-  if (!apiURL && !validOldSetup) {
-    throw new Error(`Must provide apiUrl or a client to the TinaWrapper component`);
+  if (props == null ? void 0 : props.apiURL) {
+    console.warn("The apiURL prop is deprecated. Please see https://tina.io/blog/tina-v-0.68.14 for information on how to upgrade to the new API");
   }
+  const apiURL = ((_a = props == null ? void 0 : props.client) == null ? void 0 : _a.apiUrl) || (props == null ? void 0 : props.apiURL);
   const { branch, clientId, isLocalClient } = apiURL ? parseURL(apiURL) : {
     branch: props.branch,
     clientId: props.clientId,
-    isLocalClient: props.isLocalClient
+    isLocalClient: props == null ? void 0 : props.isLocalClient
   };
+  if (typeof isLocalClient === "undefined" || !isLocalClient && (!branch || !clientId)) {
+    throw new Error("Invalid setup. See https://tina.io/docs/tina-cloud/connecting-site/ for more information.");
+  }
   if (!schema) {
     throw new Error("`schema` is required to be passed as a property to `TinaProvider`.  You can learn more about this change here: https://github.com/tinacms/tinacms/pull/2823");
   }
@@ -4745,9 +4750,10 @@ const useGetCollection = (cms, collectionName, includeDocuments = true, after =
   const [resetState, setResetSate] = useState(0);
   useEffect(() => {
     const fetchCollection = async () => {
+      var _a;
       if (await api.isAuthenticated()) {
         const { name, order } = JSON.parse(sortKey || "{}");
-        const validSortKey = collectionExtra.fields.map((x) => x.name).includes(name) ? name : void 0;
+        const validSortKey = ((_a = collectionExtra.fields) == null ? void 0 : _a.map((x) => x.name).includes(name)) ? name : void 0;
         try {
           const collection2 = await api.fetchCollection(collectionName, includeDocuments, after, validSortKey, order);
           setCollection(collection2);
@@ -4855,12 +4861,12 @@ const CollectionListPage = () => {
       startCursor: endCursor,
       sortKey
     }, (collection, _loading, reFetchCollection, collectionExtra) => {
-      var _a, _b;
+      var _a, _b, _c;
       const totalCount = collection.documents.totalCount;
       const documents = collection.documents.edges;
       const admin = cms.api.admin;
       const pageInfo = collection.documents.pageInfo;
-      const fields = collectionExtra.fields.filter((x) => ["string", "number", "datetime"].includes(x.type));
+      const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime"].includes(x.type));
       return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, open && /* @__PURE__ */ React.createElement(DeleteModal, {
         filename: vars.relativePath,
         deleteFunc: async () => {
@@ -4876,7 +4882,7 @@ const CollectionListPage = () => {
         },
         close: () => setOpen(false)
       }), /* @__PURE__ */ React.createElement(PageHeader, {
-        isLocalMode: (_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode
+        isLocalMode: (_c = (_b = cms == null ? void 0 : cms.api) == null ? void 0 : _b.tina) == null ? void 0 : _c.isLocalMode
       }, /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("div", {
         className: "flex flex-col gap-4"
       }, /* @__PURE__ */ React.createElement("h3", {
@@ -5128,9 +5134,9 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
               }
               return true;
             }
-            const isValid = /^[_a-zA-Z][\.\-_\/a-zA-Z0-9]*$/.test(value);
+            const isValid = /^[_a-zA-Z0-9][\.\-_\/a-zA-Z0-9]*$/.test(value);
             if (value && !isValid) {
-              return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
+              return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
             }
           }
         },

package/dist/index.js

@@ -1193,7 +1193,8 @@
                   return formifyInlineFragmentNode({
                     inlineFragmentNode: selectionNode,
                     parentType: type,
-                    path
+                    path,
+                    showInSidebar: true
                   });
                 }
                 case "Field": {
@@ -1263,7 +1264,8 @@
                   return formifyInlineFragmentNode({
                     inlineFragmentNode: selectionNode,
                     parentType: field.type,
-                    path: fieldPath
+                    path: fieldPath,
+                    showInSidebar: false
                   });
                 }
                 default:
@@ -1277,7 +1279,8 @@
     const formifyInlineFragmentNode = ({
       inlineFragmentNode,
       parentType,
-      path
+      path,
+      showInSidebar
     }) => {
       const type = getSelectedUnionType(parentType, inlineFragmentNode);
       if (!type) {
@@ -1288,7 +1291,7 @@
           inlineFragmentNode,
           type,
           path,
-          showInSidebar: false
+          showInSidebar
         });
       }
       return {
@@ -3872,9 +3875,9 @@ mutation addPendingDocumentMutation(
                   }
                   return true;
                 }
-                const isValid = /^[_a-zA-Z][-,_a-zA-Z0-9]*$/.test(value);
+                const isValid = /^[_a-zA-Z0-9][\-_a-zA-Z0-9]*$/.test(value);
                 if (value && !isValid) {
-                  return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, - or _";
+                  return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, - or _";
                 }
               }
             }
@@ -4034,16 +4037,18 @@ mutation addPendingDocumentMutation(
     ...props
   }) => {
     var _a;
-    const validOldSetup = new Boolean(props == null ? void 0 : props.isLocalClient) || new Boolean(props == null ? void 0 : props.clientId) && new Boolean(props == null ? void 0 : props.branch);
-    const apiURL = ((_a = props == null ? void 0 : props.client) == null ? void 0 : _a.apiUrl) || (props == null ? void 0 : props.apiURL);
-    if (!apiURL && !validOldSetup) {
-      throw new Error(`Must provide apiUrl or a client to the TinaWrapper component`);
+    if (props == null ? void 0 : props.apiURL) {
+      console.warn("The apiURL prop is deprecated. Please see https://tina.io/blog/tina-v-0.68.14 for information on how to upgrade to the new API");
     }
+    const apiURL = ((_a = props == null ? void 0 : props.client) == null ? void 0 : _a.apiUrl) || (props == null ? void 0 : props.apiURL);
     const { branch, clientId, isLocalClient } = apiURL ? parseURL(apiURL) : {
       branch: props.branch,
       clientId: props.clientId,
-      isLocalClient: props.isLocalClient
+      isLocalClient: props == null ? void 0 : props.isLocalClient
     };
+    if (typeof isLocalClient === "undefined" || !isLocalClient && (!branch || !clientId)) {
+      throw new Error("Invalid setup. See https://tina.io/docs/tina-cloud/connecting-site/ for more information.");
+    }
     if (!schema) {
       throw new Error("`schema` is required to be passed as a property to `TinaProvider`.  You can learn more about this change here: https://github.com/tinacms/tinacms/pull/2823");
     }
@@ -4763,9 +4768,10 @@ This will work when developing locally but NOT when deployed to production.
     const [resetState, setResetSate] = React.useState(0);
     React.useEffect(() => {
       const fetchCollection = async () => {
+        var _a;
         if (await api.isAuthenticated()) {
           const { name, order } = JSON.parse(sortKey || "{}");
-          const validSortKey = collectionExtra.fields.map((x) => x.name).includes(name) ? name : void 0;
+          const validSortKey = ((_a = collectionExtra.fields) == null ? void 0 : _a.map((x) => x.name).includes(name)) ? name : void 0;
           try {
             const collection2 = await api.fetchCollection(collectionName, includeDocuments, after, validSortKey, order);
             setCollection(collection2);
@@ -4873,12 +4879,12 @@ This will work when developing locally but NOT when deployed to production.
         startCursor: endCursor,
         sortKey
       }, (collection, _loading, reFetchCollection, collectionExtra) => {
-        var _a, _b;
+        var _a, _b, _c;
         const totalCount = collection.documents.totalCount;
         const documents = collection.documents.edges;
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
-        const fields = collectionExtra.fields.filter((x) => ["string", "number", "datetime"].includes(x.type));
+        const fields = (_a = collectionExtra.fields) == null ? void 0 : _a.filter((x) => ["string", "number", "datetime"].includes(x.type));
         return /* @__PURE__ */ React__default["default"].createElement(PageWrapper, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, open && /* @__PURE__ */ React__default["default"].createElement(DeleteModal, {
           filename: vars.relativePath,
           deleteFunc: async () => {
@@ -4894,7 +4900,7 @@ This will work when developing locally but NOT when deployed to production.
           },
           close: () => setOpen(false)
         }), /* @__PURE__ */ React__default["default"].createElement(PageHeader, {
-          isLocalMode: (_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.isLocalMode
+          isLocalMode: (_c = (_b = cms == null ? void 0 : cms.api) == null ? void 0 : _b.tina) == null ? void 0 : _c.isLocalMode
         }, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "flex flex-col gap-4"
         }, /* @__PURE__ */ React__default["default"].createElement("h3", {
@@ -5146,9 +5152,9 @@ This will work when developing locally but NOT when deployed to production.
                 }
                 return true;
               }
-              const isValid = /^[_a-zA-Z][\.\-_\/a-zA-Z0-9]*$/.test(value);
+              const isValid = /^[_a-zA-Z0-9][\.\-_\/a-zA-Z0-9]*$/.test(value);
               if (value && !isValid) {
-                return "Must begin with a-z, A-Z, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
+                return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
               }
             }
           },

package/dist/{rich-text.d.ts → rich-text/index.d.ts}

@@ -74,6 +74,12 @@ declare type BaseComponents = {
     maybe_mdx?: {
         children: JSX.Element;
     };
+    html?: {
+        value: string;
+    };
+    html_inline?: {
+        value: string;
+    };
     component_missing?: {
         name: string;
     };

package/dist/rich-text/index.es.js

@@ -0,0 +1,221 @@
+import React from "react";
+const TinaMarkdown = ({
+  content,
+  components = {}
+}) => {
+  if (!content) {
+    return null;
+  }
+  const nodes = Array.isArray(content) ? content : content.children;
+  if (!nodes) {
+    return null;
+  }
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, nodes.map((child, index) => {
+    return /* @__PURE__ */ React.createElement(MemoNode, {
+      components,
+      key: index,
+      child
+    });
+  }));
+};
+const Leaf = (props) => {
+  if (props.bold) {
+    const { bold, ...rest } = props;
+    if (props.components.bold) {
+      const Component = props.components.bold;
+      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
+        ...rest
+      }));
+    }
+    return /* @__PURE__ */ React.createElement("strong", null, /* @__PURE__ */ React.createElement(Leaf, {
+      ...rest
+    }));
+  }
+  if (props.italic) {
+    const { italic, ...rest } = props;
+    if (props.components.italic) {
+      const Component = props.components.italic;
+      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
+        ...rest
+      }));
+    }
+    return /* @__PURE__ */ React.createElement("em", null, /* @__PURE__ */ React.createElement(Leaf, {
+      ...rest
+    }));
+  }
+  if (props.underline) {
+    const { underline, ...rest } = props;
+    if (props.components.underline) {
+      const Component = props.components.underline;
+      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
+        ...rest
+      }));
+    }
+    return /* @__PURE__ */ React.createElement("u", null, /* @__PURE__ */ React.createElement(Leaf, {
+      ...rest
+    }));
+  }
+  if (props.strikethrough) {
+    const { strikethrough, ...rest } = props;
+    if (props.components.strikethrough) {
+      const Component = props.components.strikethrough;
+      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
+        ...rest
+      }));
+    }
+    return /* @__PURE__ */ React.createElement("s", null, /* @__PURE__ */ React.createElement(Leaf, {
+      ...rest
+    }));
+  }
+  if (props.code) {
+    const { code, ...rest } = props;
+    if (props.components.code) {
+      const Component = props.components.code;
+      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
+        ...rest
+      }));
+    }
+    return /* @__PURE__ */ React.createElement("code", null, /* @__PURE__ */ React.createElement(Leaf, {
+      ...rest
+    }));
+  }
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, props.text);
+};
+const MemoNode = (props) => {
+  const MNode = React.useMemo(() => /* @__PURE__ */ React.createElement(Node, {
+    ...props
+  }), [JSON.stringify(props)]);
+  return MNode;
+};
+const Node = ({ components, child }) => {
+  const { children, ...props } = child;
+  switch (child.type) {
+    case "h1":
+    case "h2":
+    case "h3":
+    case "h4":
+    case "h5":
+    case "h6":
+    case "p":
+    case "blockquote":
+    case "ol":
+    case "ul":
+    case "li":
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
+          components,
+          content: children
+        }));
+      }
+      return React.createElement(child.type, {
+        children: /* @__PURE__ */ React.createElement(TinaMarkdown, {
+          components,
+          content: children
+        })
+      });
+    case "lic":
+      return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(TinaMarkdown, {
+        components,
+        content: child.children
+      }));
+    case "img":
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        });
+      }
+      return /* @__PURE__ */ React.createElement("img", {
+        src: child.url,
+        alt: child.caption
+      });
+    case "a":
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
+          components,
+          content: children
+        }));
+      }
+      return /* @__PURE__ */ React.createElement("a", {
+        href: child.url
+      }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
+        components,
+        content: children
+      }));
+    case "code_block":
+      const value = child.value;
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        }, value);
+      }
+      return /* @__PURE__ */ React.createElement("pre", null, /* @__PURE__ */ React.createElement("code", null, value));
+    case "hr":
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        });
+      }
+      return /* @__PURE__ */ React.createElement("hr", null);
+    case "break":
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        });
+      }
+      return /* @__PURE__ */ React.createElement("br", null);
+    case "text":
+      return /* @__PURE__ */ React.createElement(Leaf, {
+        components,
+        ...child
+      });
+    case "mdxJsxTextElement":
+    case "mdxJsxFlowElement":
+      const Component = components[child.name];
+      if (Component) {
+        const props2 = child.props ? child.props : {};
+        return /* @__PURE__ */ React.createElement(Component, {
+          ...props2
+        });
+      } else {
+        const ComponentMissing = components["component_missing"];
+        if (ComponentMissing) {
+          return /* @__PURE__ */ React.createElement(ComponentMissing, {
+            name: child.name
+          });
+        } else {
+          return /* @__PURE__ */ React.createElement("span", null, `No component provided for ${child.name}`);
+        }
+      }
+    case "maybe_mdx":
+      return null;
+    case "html":
+    case "html_inline":
+      if (components[child.type]) {
+        const Component2 = components[child.type];
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        });
+      }
+      return child.value;
+    case "invalid_markdown":
+      return /* @__PURE__ */ React.createElement("pre", null, child.value);
+    default:
+      if (typeof child.text === "string") {
+        return /* @__PURE__ */ React.createElement(Leaf, {
+          components,
+          ...child
+        });
+      }
+  }
+};
+export { TinaMarkdown };

package/dist/{rich-text.js → rich-text/index.js}

@@ -18,150 +18,11 @@
       return null;
     }
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, nodes.map((child, index) => {
-      const key = index;
-      const { children, ...props } = child;
-      switch (child.type) {
-        case "h1":
-        case "h2":
-        case "h3":
-        case "h4":
-        case "h5":
-        case "h6":
-        case "p":
-        case "blockquote":
-        case "ol":
-        case "ul":
-        case "li":
-          if (components[child.type]) {
-            const Component2 = components[child.type];
-            return /* @__PURE__ */ React__default["default"].createElement(Component2, {
-              key,
-              ...props
-            }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
-              components,
-              content: children
-            }));
-          }
-          return React__default["default"].createElement(child.type, {
-            key,
-            children: /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
-              components,
-              content: children
-            })
-          });
-        case "lic":
-          return /* @__PURE__ */ React__default["default"].createElement("div", {
-            key
-          }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
-            components,
-            content: child.children
-          }));
-        case "img":
-          if (components[child.type]) {
-            const Component2 = components[child.type];
-            return /* @__PURE__ */ React__default["default"].createElement(Component2, {
-              key,
-              ...props
-            });
-          }
-          return /* @__PURE__ */ React__default["default"].createElement("img", {
-            key,
-            src: child.url,
-            alt: child.caption
-          });
-        case "a":
-          if (components[child.type]) {
-            const Component2 = components[child.type];
-            return /* @__PURE__ */ React__default["default"].createElement(Component2, {
-              key,
-              ...props
-            }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
-              components,
-              content: children
-            }));
-          }
-          return /* @__PURE__ */ React__default["default"].createElement("a", {
-            key,
-            href: child.url
-          }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
-            components,
-            content: children
-          }));
-        case "code_block":
-          const value = child.children.map((item) => {
-            var _a;
-            return item.children ? ((_a = item.children[0]) == null ? void 0 : _a.text) || "" : "";
-          }).join("\n");
-          if (components[child.type]) {
-            const Component2 = components[child.type];
-            return /* @__PURE__ */ React__default["default"].createElement(Component2, {
-              key,
-              ...props
-            }, value);
-          }
-          return /* @__PURE__ */ React__default["default"].createElement("pre", {
-            key
-          }, /* @__PURE__ */ React__default["default"].createElement("code", null, value));
-        case "hr":
-          if (components[child.type]) {
-            const Component2 = components[child.type];
-            return /* @__PURE__ */ React__default["default"].createElement(Component2, {
-              key,
-              ...props
-            });
-          }
-          return /* @__PURE__ */ React__default["default"].createElement("hr", {
-            key
-          });
-        case "break":
-          if (components[child.type]) {
-            const Component2 = components[child.type];
-            return /* @__PURE__ */ React__default["default"].createElement(Component2, {
-              key,
-              ...props
-            });
-          }
-          return /* @__PURE__ */ React__default["default"].createElement("br", {
-            key
-          });
-        case "text":
-          return /* @__PURE__ */ React__default["default"].createElement(Leaf, {
-            key,
-            components,
-            ...child
-          });
-        case "mdxJsxTextElement":
-        case "mdxJsxFlowElement":
-          const Component = components[child.name];
-          if (Component) {
-            const props2 = child.props ? child.props : {};
-            return /* @__PURE__ */ React__default["default"].createElement(Component, {
-              key,
-              ...props2
-            });
-          } else {
-            const ComponentMissing = components["component_missing"];
-            if (ComponentMissing) {
-              return /* @__PURE__ */ React__default["default"].createElement(ComponentMissing, {
-                key,
-                name: child.name
-              });
-            } else {
-              throw new Error(`No component provided for ${child.name}`);
-            }
-          }
-        case "maybe_mdx":
-          return null;
-        default:
-          if (typeof child.text === "string") {
-            return /* @__PURE__ */ React__default["default"].createElement(Leaf, {
-              key,
-              components,
-              ...child
-            });
-          }
-          console.log(`No tina renderer for ${child.type}`, child);
-      }
+      return /* @__PURE__ */ React__default["default"].createElement(MemoNode, {
+        components,
+        key: index,
+        child
+      });
     }));
   };
   const Leaf = (props) => {
@@ -227,6 +88,143 @@
     }
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, props.text);
   };
+  const MemoNode = (props) => {
+    const MNode = React__default["default"].useMemo(() => /* @__PURE__ */ React__default["default"].createElement(Node, {
+      ...props
+    }), [JSON.stringify(props)]);
+    return MNode;
+  };
+  const Node = ({ components, child }) => {
+    const { children, ...props } = child;
+    switch (child.type) {
+      case "h1":
+      case "h2":
+      case "h3":
+      case "h4":
+      case "h5":
+      case "h6":
+      case "p":
+      case "blockquote":
+      case "ol":
+      case "ul":
+      case "li":
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
+            components,
+            content: children
+          }));
+        }
+        return React__default["default"].createElement(child.type, {
+          children: /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
+            components,
+            content: children
+          })
+        });
+      case "lic":
+        return /* @__PURE__ */ React__default["default"].createElement("div", null, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
+          components,
+          content: child.children
+        }));
+      case "img":
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          });
+        }
+        return /* @__PURE__ */ React__default["default"].createElement("img", {
+          src: child.url,
+          alt: child.caption
+        });
+      case "a":
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
+            components,
+            content: children
+          }));
+        }
+        return /* @__PURE__ */ React__default["default"].createElement("a", {
+          href: child.url
+        }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
+          components,
+          content: children
+        }));
+      case "code_block":
+        const value = child.value;
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          }, value);
+        }
+        return /* @__PURE__ */ React__default["default"].createElement("pre", null, /* @__PURE__ */ React__default["default"].createElement("code", null, value));
+      case "hr":
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          });
+        }
+        return /* @__PURE__ */ React__default["default"].createElement("hr", null);
+      case "break":
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          });
+        }
+        return /* @__PURE__ */ React__default["default"].createElement("br", null);
+      case "text":
+        return /* @__PURE__ */ React__default["default"].createElement(Leaf, {
+          components,
+          ...child
+        });
+      case "mdxJsxTextElement":
+      case "mdxJsxFlowElement":
+        const Component = components[child.name];
+        if (Component) {
+          const props2 = child.props ? child.props : {};
+          return /* @__PURE__ */ React__default["default"].createElement(Component, {
+            ...props2
+          });
+        } else {
+          const ComponentMissing = components["component_missing"];
+          if (ComponentMissing) {
+            return /* @__PURE__ */ React__default["default"].createElement(ComponentMissing, {
+              name: child.name
+            });
+          } else {
+            return /* @__PURE__ */ React__default["default"].createElement("span", null, `No component provided for ${child.name}`);
+          }
+        }
+      case "maybe_mdx":
+        return null;
+      case "html":
+      case "html_inline":
+        if (components[child.type]) {
+          const Component2 = components[child.type];
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          });
+        }
+        return child.value;
+      case "invalid_markdown":
+        return /* @__PURE__ */ React__default["default"].createElement("pre", null, child.value);
+      default:
+        if (typeof child.text === "string") {
+          return /* @__PURE__ */ React__default["default"].createElement(Leaf, {
+            components,
+            ...child
+          });
+        }
+    }
+  };
   exports2.TinaMarkdown = TinaMarkdown;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });

package/dist/tina-cms.d.ts

@@ -10,107 +10,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import React from 'react';
-import type { TinaClient } from './client';
-import { TinaCloudMediaStoreClass } from './auth';
-import type { TinaCMS } from '@tinacms/toolkit';
-import type { TinaCloudSchema } from '@tinacms/schema-tools';
-import type { TinaIOConfig } from './internalClient/index';
 import type { formifyCallback } from './hooks/use-graphql-forms';
-import { useDocumentCreatorPlugin } from './hooks/use-content-creator';
-declare type APIProviderProps = {
-    /**
-     * The API url From this client will be used to make requests.
-     *
-     */
-    client?: never;
-    /**
-     * Content API URL
-     *
-     */
-    apiURL: string;
-    /**
-     * Point to the local version of GraphQL instead of tina.io
-     * https://tina.io/docs/tinacms-context/#adding-tina-to-the-sites-frontend
-     *
-     * @deprecated use apiURL instead
-     */
-    isLocalClient?: never;
-    /**
-     * The base branch to pull content from. Note that this is ignored for local development
-     *
-     * @deprecated use apiURL instead
-     */
-    branch?: never;
-    /**
-     * Your clientId from tina.io
-     *
-     * @deprecated use apiURL instead
-     */
-    clientId?: never;
-} | {
-    /**
-     * The API url From this client will be used to make requests.
-     *
-     */
-    client: TinaClient<unknown>;
-    /**
-     * Content API URL
-     *
-     */
-    apiURL?: never;
-    /**
-     * Point to the local version of GraphQL instead of tina.io
-     * https://tina.io/docs/tinacms-context/#adding-tina-to-the-sites-frontend
-     *
-     * @deprecated use apiURL instead
-     */
-    isLocalClient?: never;
-    /**
-     * The base branch to pull content from. Note that this is ignored for local development
-     *
-     * @deprecated use apiURL instead
-     */
-    branch?: never;
-    /**
-     * Your clientId from tina.io
-     *
-     * @deprecated use apiURL instead
-     */
-    clientId?: never;
-};
-interface BaseProviderProps {
-    /** Callback if you need access to the TinaCMS instance */
-    cmsCallback?: (cms: TinaCMS) => TinaCMS;
-    /** Callback if you need access to the "formify" API */
-    formifyCallback?: formifyCallback;
-    /** Callback if you need access to the "document creator" API */
-    documentCreatorCallback?: Parameters<typeof useDocumentCreatorPlugin>[0];
-    /** TinaCMS media store instance */
-    mediaStore?: TinaCloudMediaStoreClass | (() => Promise<TinaCloudMediaStoreClass>);
-    tinaioConfig?: TinaIOConfig;
-    schema?: TinaCloudSchema<false>;
-}
-declare type QueryProviderProps = {
-    /** Your React page component */
-    children: (props?: any) => React.ReactNode;
-    /** The query from getStaticProps */
-    query: string | undefined;
-    /** Any variables from getStaticProps */
-    variables: object | undefined;
-    /** The `data` from getStaticProps */
-    data: object;
-} | {
-    /** Your React page component */
-    children: React.ReactNode;
-    /** The query from getStaticProps */
-    query?: never;
-    /** Any variables from getStaticProps */
-    variables?: never;
-    /** The `data` from getStaticProps */
-    data?: never;
-};
-export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps;
+import { TinaCMSProviderDefaultProps } from './types/cms';
 export declare const TinaCMSProvider2: ({ query, documentCreatorCallback, formifyCallback, schema, ...props }: TinaCMSProviderDefaultProps) => JSX.Element;
 export declare const TinaDataProvider: ({ children, formifyCallback, }: {
     children: any;
@@ -144,4 +45,3 @@ export declare const staticRequest: ({ query, variables, }: {
  * query or muation
  */
 export declare function gql(strings: TemplateStringsArray, ...args: string[]): string;
-export {};

package/dist/types/cms.d.ts

@@ -0,0 +1,64 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+/// <reference types="react" />
+import type { TinaCMS } from '@tinacms/toolkit';
+import type { TinaCloudSchema, TinaCloudSchemaConfig } from '@tinacms/schema-tools';
+import type { TinaCloudMediaStoreClass } from '../auth';
+import type { useDocumentCreatorPlugin } from '../hooks/use-content-creator';
+import type { formifyCallback } from '../hooks/use-graphql-forms';
+import type { TinaIOConfig } from '../internalClient';
+import type { TinaClient } from '../client';
+declare type APIProviderProps = {
+    /**
+     * @deprecated Please see https://tina.io/blog/tina-v-0.68.14 for information on how to upgrade to the new API
+     *
+     */
+    apiURL?: string;
+    /**
+     * The API url From this client will be used to make requests.
+     */
+    client: TinaClient<unknown>;
+};
+interface BaseProviderProps {
+    /** Callback if you need access to the TinaCMS instance */
+    cmsCallback?: (cms: TinaCMS) => TinaCMS;
+    /** Callback if you need access to the "formify" API */
+    formifyCallback?: formifyCallback;
+    /** Callback if you need access to the "document creator" API */
+    documentCreatorCallback?: Parameters<typeof useDocumentCreatorPlugin>[0];
+    /** TinaCMS media store instance */
+    mediaStore?: TinaCloudMediaStoreClass | (() => Promise<TinaCloudMediaStoreClass>);
+    tinaioConfig?: TinaIOConfig;
+    schema?: TinaCloudSchema<false>;
+}
+declare type QueryProviderProps = {
+    /** Your React page component */
+    children: (props?: any) => React.ReactNode;
+    /** The query from getStaticProps */
+    query: string | undefined;
+    /** Any variables from getStaticProps */
+    variables: object | undefined;
+    /** The `data` from getStaticProps */
+    data: object;
+} | {
+    /** Your React page component */
+    children: React.ReactNode;
+    /** The query from getStaticProps */
+    query?: never;
+    /** Any variables from getStaticProps */
+    variables?: never;
+    /** The `data` from getStaticProps */
+    data?: never;
+};
+export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & TinaCloudSchemaConfig;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.68.15",
+  "version": "0.69.2",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -20,9 +20,14 @@
       "require": "./dist/edit-state.js"
     },
     "./dist/rich-text": {
-      "types": "./dist/rich-text.d.ts",
-      "import": "./dist/rich-text.es.js",
-      "require": "./dist/rich-text.js"
+      "types": "./dist/rich-text/index.d.ts",
+      "import": "./dist/rich-text/index.es.js",
+      "require": "./dist/rich-text/index.js"
+    },
+    "./dist/rich-text/prism": {
+      "types": "./dist/rich-text/prism.d.ts",
+      "import": "./dist/rich-text/prism.es.js",
+      "require": "./dist/rich-text/prism.js"
     }
   },
   "files": [
@@ -32,7 +37,7 @@
     "entryPoints": [
       "src/index.ts",
       "src/edit-state.tsx",
-      "src/rich-text.tsx",
+      "src/rich-text/index.tsx",
       "src/client.ts"
     ]
   },
@@ -43,15 +48,17 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "0.0.9",
+    "@tinacms/schema-tools": "0.1.0",
     "@tinacms/sharedctx": "0.1.2",
-    "@tinacms/toolkit": "0.56.37",
+    "@tinacms/toolkit": "0.57.1",
     "crypto-js": "^4.0.0",
     "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",
     "graphql": "^15.1.0",
     "graphql-tag": "^2.11.0",
     "lodash.set": "^4.3.2",
+    "prism-react-renderer": "^1.3.5",
+    "prism": "^4.1.2",
     "react-icons": "^4.3.1",
     "react-router-dom": "6",
     "url-pattern": "^1.0.3",
@@ -63,7 +70,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^12.7.0",
-    "@tinacms/scripts": "0.50.9",
+    "@tinacms/scripts": "0.51.1",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.169",
     "@types/node": "^14.0.13",
@@ -73,7 +80,7 @@
     "isomorphic-fetch": "^3.0.0",
     "jest": "^27.0.6",
     "jest-file-snapshot": "^0.5.0",
-    "next": "9.4.2",
+    "next": "12.2.4",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-is": "^17.0.2",

package/dist/rich-text.es.js

@@ -1,223 +0,0 @@
-import React from "react";
-const TinaMarkdown = ({
-  content,
-  components = {}
-}) => {
-  if (!content) {
-    return null;
-  }
-  const nodes = Array.isArray(content) ? content : content.children;
-  if (!nodes) {
-    return null;
-  }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, nodes.map((child, index) => {
-    const key = index;
-    const { children, ...props } = child;
-    switch (child.type) {
-      case "h1":
-      case "h2":
-      case "h3":
-      case "h4":
-      case "h5":
-      case "h6":
-      case "p":
-      case "blockquote":
-      case "ol":
-      case "ul":
-      case "li":
-        if (components[child.type]) {
-          const Component2 = components[child.type];
-          return /* @__PURE__ */ React.createElement(Component2, {
-            key,
-            ...props
-          }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
-            components,
-            content: children
-          }));
-        }
-        return React.createElement(child.type, {
-          key,
-          children: /* @__PURE__ */ React.createElement(TinaMarkdown, {
-            components,
-            content: children
-          })
-        });
-      case "lic":
-        return /* @__PURE__ */ React.createElement("div", {
-          key
-        }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
-          components,
-          content: child.children
-        }));
-      case "img":
-        if (components[child.type]) {
-          const Component2 = components[child.type];
-          return /* @__PURE__ */ React.createElement(Component2, {
-            key,
-            ...props
-          });
-        }
-        return /* @__PURE__ */ React.createElement("img", {
-          key,
-          src: child.url,
-          alt: child.caption
-        });
-      case "a":
-        if (components[child.type]) {
-          const Component2 = components[child.type];
-          return /* @__PURE__ */ React.createElement(Component2, {
-            key,
-            ...props
-          }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
-            components,
-            content: children
-          }));
-        }
-        return /* @__PURE__ */ React.createElement("a", {
-          key,
-          href: child.url
-        }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
-          components,
-          content: children
-        }));
-      case "code_block":
-        const value = child.children.map((item) => {
-          var _a;
-          return item.children ? ((_a = item.children[0]) == null ? void 0 : _a.text) || "" : "";
-        }).join("\n");
-        if (components[child.type]) {
-          const Component2 = components[child.type];
-          return /* @__PURE__ */ React.createElement(Component2, {
-            key,
-            ...props
-          }, value);
-        }
-        return /* @__PURE__ */ React.createElement("pre", {
-          key
-        }, /* @__PURE__ */ React.createElement("code", null, value));
-      case "hr":
-        if (components[child.type]) {
-          const Component2 = components[child.type];
-          return /* @__PURE__ */ React.createElement(Component2, {
-            key,
-            ...props
-          });
-        }
-        return /* @__PURE__ */ React.createElement("hr", {
-          key
-        });
-      case "break":
-        if (components[child.type]) {
-          const Component2 = components[child.type];
-          return /* @__PURE__ */ React.createElement(Component2, {
-            key,
-            ...props
-          });
-        }
-        return /* @__PURE__ */ React.createElement("br", {
-          key
-        });
-      case "text":
-        return /* @__PURE__ */ React.createElement(Leaf, {
-          key,
-          components,
-          ...child
-        });
-      case "mdxJsxTextElement":
-      case "mdxJsxFlowElement":
-        const Component = components[child.name];
-        if (Component) {
-          const props2 = child.props ? child.props : {};
-          return /* @__PURE__ */ React.createElement(Component, {
-            key,
-            ...props2
-          });
-        } else {
-          const ComponentMissing = components["component_missing"];
-          if (ComponentMissing) {
-            return /* @__PURE__ */ React.createElement(ComponentMissing, {
-              key,
-              name: child.name
-            });
-          } else {
-            throw new Error(`No component provided for ${child.name}`);
-          }
-        }
-      case "maybe_mdx":
-        return null;
-      default:
-        if (typeof child.text === "string") {
-          return /* @__PURE__ */ React.createElement(Leaf, {
-            key,
-            components,
-            ...child
-          });
-        }
-        console.log(`No tina renderer for ${child.type}`, child);
-    }
-  }));
-};
-const Leaf = (props) => {
-  if (props.bold) {
-    const { bold, ...rest } = props;
-    if (props.components.bold) {
-      const Component = props.components.bold;
-      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
-        ...rest
-      }));
-    }
-    return /* @__PURE__ */ React.createElement("strong", null, /* @__PURE__ */ React.createElement(Leaf, {
-      ...rest
-    }));
-  }
-  if (props.italic) {
-    const { italic, ...rest } = props;
-    if (props.components.italic) {
-      const Component = props.components.italic;
-      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
-        ...rest
-      }));
-    }
-    return /* @__PURE__ */ React.createElement("em", null, /* @__PURE__ */ React.createElement(Leaf, {
-      ...rest
-    }));
-  }
-  if (props.underline) {
-    const { underline, ...rest } = props;
-    if (props.components.underline) {
-      const Component = props.components.underline;
-      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
-        ...rest
-      }));
-    }
-    return /* @__PURE__ */ React.createElement("u", null, /* @__PURE__ */ React.createElement(Leaf, {
-      ...rest
-    }));
-  }
-  if (props.strikethrough) {
-    const { strikethrough, ...rest } = props;
-    if (props.components.strikethrough) {
-      const Component = props.components.strikethrough;
-      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
-        ...rest
-      }));
-    }
-    return /* @__PURE__ */ React.createElement("s", null, /* @__PURE__ */ React.createElement(Leaf, {
-      ...rest
-    }));
-  }
-  if (props.code) {
-    const { code, ...rest } = props;
-    if (props.components.code) {
-      const Component = props.components.code;
-      return /* @__PURE__ */ React.createElement(Component, null, /* @__PURE__ */ React.createElement(Leaf, {
-        ...rest
-      }));
-    }
-    return /* @__PURE__ */ React.createElement("code", null, /* @__PURE__ */ React.createElement(Leaf, {
-      ...rest
-    }));
-  }
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, props.text);
-};
-export { TinaMarkdown };