tinacms 0.60.2 → 0.63.0

package/dist/index.js

@@ -30,8 +30,8 @@ var __objRest = (source, exclude) => {
   return target;
 };
 (function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@tinacms/toolkit"), require("graphql"), require("lodash.set"), require("graphql-tag"), require("react"), require("styled-components"), require("yup"), require("@tinacms/sharedctx"), require("final-form"), require("react-router-dom"), require("@headlessui/react")) : typeof define === "function" && define.amd ? define(["exports", "@tinacms/toolkit", "graphql", "lodash.set", "graphql-tag", "react", "styled-components", "yup", "@tinacms/sharedctx", "final-form", "react-router-dom", "@headlessui/react"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
-})(this, function(exports2, toolkit, graphql, set, gql$1, React, styled, yup, sharedctx, finalForm, reactRouterDom, react) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("@tinacms/toolkit"), require("graphql"), require("lodash.set"), require("graphql-tag"), require("react"), require("styled-components"), require("yup"), require("@tinacms/sharedctx"), require("final-form"), require("url-pattern"), require("react-router-dom"), require("@headlessui/react")) : typeof define === "function" && define.amd ? define(["exports", "@tinacms/toolkit", "graphql", "lodash.set", "graphql-tag", "react", "styled-components", "yup", "@tinacms/sharedctx", "final-form", "url-pattern", "react-router-dom", "@headlessui/react"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP, global.NOOP));
+})(this, function(exports2, toolkit, graphql, set, gql$1, React, styled, yup, sharedctx, finalForm, UrlPattern, reactRouterDom, react) {
   "use strict";
   function _interopDefaultLegacy(e) {
     return e && typeof e === "object" && "default" in e ? e : { "default": e };
@@ -61,6 +61,7 @@ var __objRest = (source, exclude) => {
   var React__default = /* @__PURE__ */ _interopDefaultLegacy(React);
   var styled__default = /* @__PURE__ */ _interopDefaultLegacy(styled);
   var yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
+  var UrlPattern__default = /* @__PURE__ */ _interopDefaultLegacy(UrlPattern);
   function popupWindow(url, title, window2, w, h) {
     const y = window2.top.outerHeight / 2 + window2.top.screenY - h / 2;
     const x = window2.top.outerWidth / 2 + window2.top.screenX - w / 2;
@@ -394,6 +395,11 @@ var __objRest = (source, exclude) => {
       throw new Error(`Expected an instance of GraphQLUnionType for type ${type.name}`);
     }
   }
+  const captureBranchName = /^refs\/heads\/(.*)/;
+  const parseRefForBranchName = (ref) => {
+    const matches = ref.match(captureBranchName);
+    return matches[1];
+  };
   class Client {
     constructor(_a) {
       var _b = _a, { tokenStorage = "MEMORY" } = _b, options = __objRest(_b, ["tokenStorage"]);
@@ -484,6 +490,9 @@ mutation addPendingDocumentMutation(
           break;
       }
     }
+    get isLocalMode() {
+      return this.contentApiUrl.includes("localhost");
+    }
     setBranch(branchName) {
       var _a, _b, _c;
       const encodedBranch = encodeURIComponent(branchName);
@@ -611,15 +620,15 @@ mutation addPendingDocumentMutation(
       try {
         const res = await this.fetchWithToken(url, {
           method: "POST",
-          body: {
+          body: JSON.stringify({
             baseBranch,
             branchName
-          },
+          }),
           headers: {
             "Content-Type": "application/json"
           }
         });
-        return JSON.stringify(res);
+        return await res.json().then((r) => parseRefForBranchName(r.data.ref));
       } catch (error) {
         console.error("There was an error creating a new branch.", error);
         return null;
@@ -1390,7 +1399,7 @@ mutation addPendingDocumentMutation(
         }));
       };
       run();
-    }, [cms, values == null ? void 0 : values.collection]);
+    }, [cms]);
     React__default["default"].useEffect(() => {
       if (plugin) {
         cms.plugins.add(plugin);
@@ -1402,6 +1411,18 @@ mutation addPendingDocumentMutation(
       };
     }, [plugin]);
   };
+  const errorButtonStyles = {
+    background: "#eb6337",
+    padding: "12px 18px",
+    cursor: "pointer",
+    borderRadius: "50px",
+    textTransform: "uppercase",
+    letterSpacing: "2px",
+    fontWeight: "bold",
+    border: "none",
+    color: "white",
+    margin: "1rem 0"
+  };
   const SetupHooks = (props) => {
     const cms = toolkit.useCMS();
     const [payload, isLoading] = useGraphqlForms({
@@ -1431,6 +1452,8 @@ mutation addPendingDocumentMutation(
       return { hasError: true, message: error.message };
     }
     render() {
+      const branchData = window.localStorage.getItem("tinacms-current-branch");
+      const hasBranchData = branchData && branchData.length > 0;
       if (this.state.hasError && !this.state.pageRefresh) {
         return /* @__PURE__ */ React__default["default"].createElement("div", {
           style: {
@@ -1451,25 +1474,21 @@ mutation addPendingDocumentMutation(
           }
         }, /* @__PURE__ */ React__default["default"].createElement("h3", {
           style: { color: "#eb6337" }
-        }, "TinaCMS Render Error"), /* @__PURE__ */ React__default["default"].createElement("p", null, "Tina caught an error while updating the page:"), /* @__PURE__ */ React__default["default"].createElement("pre", null, this.state.message), /* @__PURE__ */ React__default["default"].createElement("br", null), /* @__PURE__ */ React__default["default"].createElement("p", null, `If you've just updated the form, undo your most recent changes and click "refresh". If after a few refreshes, you're still encountering this error. There is a bigger issue with the site. Please reach out to your site admin.`), /* @__PURE__ */ React__default["default"].createElement("div", {
-          style: { padding: "10px 0" }
-        }, /* @__PURE__ */ React__default["default"].createElement("button", {
-          style: {
-            background: "#eb6337",
-            padding: "12px 18px",
-            cursor: "pointer",
-            borderRadius: "50px",
-            textTransform: "uppercase",
-            letterSpacing: "2px",
-            fontWeight: "bold",
-            border: "none",
-            color: "white"
-          },
+        }, "TinaCMS Render Error"), /* @__PURE__ */ React__default["default"].createElement("p", null, "Tina caught an error while updating the page:"), /* @__PURE__ */ React__default["default"].createElement("pre", {
+          style: { marginTop: "1rem", overflowX: "auto" }
+        }, this.state.message), /* @__PURE__ */ React__default["default"].createElement("br", null), /* @__PURE__ */ React__default["default"].createElement("p", null, `If you've just updated the form, undo your most recent changes and click "refresh". If after a few refreshes, you're still encountering this error. There is a bigger issue with the site. Please reach out to your site admin.`), /* @__PURE__ */ React__default["default"].createElement("button", {
+          style: errorButtonStyles,
           onClick: () => {
             this.setState({ pageRefresh: true });
             setTimeout(() => this.setState({ hasError: false, pageRefresh: false }), 3e3);
           }
-        }, "Refresh"))));
+        }, "Refresh"), hasBranchData && /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, /* @__PURE__ */ React__default["default"].createElement("p", null, `If you're using the branch switcher, you may currently be on a "stale" branch that has been deleted or whose content is not compatible with the latest version of the site's layout. Click the button below to switch back to the default branch for this deployment.`), /* @__PURE__ */ React__default["default"].createElement("button", {
+          style: errorButtonStyles,
+          onClick: () => {
+            window.localStorage.removeItem("tinacms-current-branch");
+            window.location.reload();
+          }
+        }, "Switch to default branch"))));
       }
       if (this.state.pageRefresh) {
         return /* @__PURE__ */ React__default["default"].createElement(Loader, null, "Let's try that again.");
@@ -1477,20 +1496,29 @@ mutation addPendingDocumentMutation(
       return this.props.children;
     }
   }
+  const parseURL = (url) => {
+    if (url.includes("localhost")) {
+      return { branch: null, isLocalClient: true, clientId: null };
+    }
+    const tinaHost = "content.tinajs.io";
+    const params = new URL(url);
+    const pattern = new UrlPattern__default["default"]("/content/:clientId/github/:branch");
+    const result = pattern.match(params.pathname);
+    if (params.host !== tinaHost) {
+      throw new Error(`The only supported hosts are ${tinaHost} or localhost, but received ${params.host}.`);
+    }
+    return __spreadProps(__spreadValues({}, result), {
+      isLocalClient: false
+    });
+  };
   const TinaCMSProvider2 = (_c) => {
     var _d = _c, {
       children,
-      branch,
-      clientId,
-      isLocalClient,
       cmsCallback,
       mediaStore,
       tinaioConfig
     } = _d, props = __objRest(_d, [
       "children",
-      "branch",
-      "clientId",
-      "isLocalClient",
       "cmsCallback",
       "mediaStore",
       "tinaioConfig"
@@ -1498,6 +1526,14 @@ mutation addPendingDocumentMutation(
     if (typeof props.query === "string") {
       props.query;
     }
+    if (!props.apiURL && !((props == null ? void 0 : props.clientId) || (props == null ? void 0 : props.isLocalClient))) {
+      throw new Error(`apiURL is a required field`);
+    }
+    const { branch, clientId, isLocalClient } = props.apiURL ? parseURL(props.apiURL) : {
+      branch: props.branch,
+      clientId: props.clientId,
+      isLocalClient: props.isLocalClient
+    };
     return /* @__PURE__ */ React__default["default"].createElement(TinaCloudProvider, {
       branch,
       clientId,
@@ -1639,10 +1675,10 @@ mutation addPendingDocumentMutation(
     if (!is_server()) {
       console.warn(`Whoops! Looks like you are using \`staticRequest\` in the browser to fetch data.
 
-The local server is not available outside of \`getStaticProps\` or \`getStaticPaths\` functions. 
+The local server is not available outside of \`getStaticProps\` or \`getStaticPaths\` functions.
 This function should only be called on the server at build time.
 
-This will work when developing locally but NOT when deployed to production. 
+This will work when developing locally but NOT when deployed to production.
 `);
     }
     return client.request(query, { variables });
@@ -1786,7 +1822,7 @@ This will work when developing locally but NOT when deployed to production.
     return /* @__PURE__ */ React__default["default"].createElement("div", {
       className: "h-screen w-full bg-gradient-to-b from-blue-900 to-gray-900 flex items-center justify-center px-4 py-6"
     }, /* @__PURE__ */ React__default["default"].createElement("div", {
-      className: "bg-white rounded-lg overflow-hidden shadow-lg w-full max-w-md"
+      className: "bg-white rounded-lg overflow-hidden shadow-lg w-full max-w-lg"
     }, /* @__PURE__ */ React__default["default"].createElement("div", {
       className: "px-5 py-4 border-b border-gray-150"
     }, /* @__PURE__ */ React__default["default"].createElement("h2", {
@@ -1811,9 +1847,7 @@ This will work when developing locally but NOT when deployed to production.
   const LoginPage = () => {
     const { setEdit } = sharedctx.useEditState();
     const login = () => setEdit(true);
-    return /* @__PURE__ */ React__default["default"].createElement(AuthTemplate, {
-      message: "Please log in to Tina Cloud to access your content."
-    }, /* @__PURE__ */ React__default["default"].createElement("a", {
+    return /* @__PURE__ */ React__default["default"].createElement(AuthTemplate, null, /* @__PURE__ */ React__default["default"].createElement("a", {
       href: "/",
       className: "flex-1 text-center inline-flex justify-center items-center px-8 py-3 shadow-sm text-sm leading-4 font-medium rounded-full text-gray-600 border border-gray-150 hover:opacity-80 hover:bg-gray-50 focus:outline-none focus:shadow-outline-blue  transition duration-150 ease-out"
     }, /* @__PURE__ */ React__default["default"].createElement(MdOutlineArrowBack, {
@@ -1825,7 +1859,7 @@ This will work when developing locally but NOT when deployed to production.
       style: { background: "#0084FF" }
     }, /* @__PURE__ */ React__default["default"].createElement(BiLogIn, {
       className: "w-6 h-auto mr-1.5 opacity-80"
-    }), " Log in"));
+    }), " Enter edit-mode"));
   };
   const logout = () => {
     sharedctx.setEditing(false);
@@ -1993,11 +2027,11 @@ This will work when developing locally but NOT when deployed to production.
             className: "block text-xs mb-0.5 text-gray-400 uppercase"
           }, "Filename"), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Link, {
             to: `${location2.pathname}/${document2.node.sys.filename}`,
-            className: "h-5 leading-5 block"
+            className: "h-5 leading-5 flex max-w-xs"
           }, /* @__PURE__ */ React__default["default"].createElement("span", {
-            className: "leading-5 font-medium text-base overflow-ellipsis overflow-hidden whitespace-nowrap text-gray-700"
+            className: "flex-shrink-1 leading-5 font-medium text-base overflow-ellipsis overflow-hidden whitespace-nowrap text-gray-700"
           }, document2.node.sys.filename), /* @__PURE__ */ React__default["default"].createElement("span", {
-            className: "leading-5 text-base font-medium text-gray-300"
+            className: "flex-shrink-0 leading-5 text-base font-medium text-gray-300"
           }, document2.node.sys.extension))), /* @__PURE__ */ React__default["default"].createElement("td", {
             className: "px-5 py-3 whitespace-nowrap"
           }, /* @__PURE__ */ React__default["default"].createElement("span", {

package/dist/rich-text.d.ts

@@ -1 +1,118 @@
-export * from "../src/rich-text"
+/**
+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.
+*/
+declare type BaseComponents = {
+    h1?: {
+        children: JSX.Element;
+    };
+    h2?: {
+        children: JSX.Element;
+    };
+    h3?: {
+        children: JSX.Element;
+    };
+    h4?: {
+        children: JSX.Element;
+    };
+    h5?: {
+        children: JSX.Element;
+    };
+    h6?: {
+        children: JSX.Element;
+    };
+    p?: {
+        children: JSX.Element;
+    };
+    a?: {
+        url: string;
+        children: JSX.Element;
+    };
+    italic?: {
+        children: JSX.Element;
+    };
+    bold?: {
+        children: JSX.Element;
+    };
+    strikethrough?: {
+        children: JSX.Element;
+    };
+    underline?: {
+        children: JSX.Element;
+    };
+    code?: {
+        children: JSX.Element;
+    };
+    ul?: {
+        children: JSX.Element;
+    };
+    ol?: {
+        children: JSX.Element;
+    };
+    block_quote?: {
+        children: JSX.Element;
+    };
+    code_block?: {
+        language?: string;
+        children: JSX.Element;
+    };
+    img?: {
+        url: string;
+        caption?: string;
+        alt?: string;
+    };
+    hr?: {};
+    component_missing?: {
+        name: string;
+    };
+};
+declare type BaseComponentSignature = {
+    [BK in keyof BaseComponents]: (props: BaseComponents[BK]) => JSX.Element;
+};
+/**
+ * Define the allowed components and their props
+ * ```ts
+ * const components:
+ * Components<{
+ *  BlockQuote: {
+ *      children: TinaMarkdownContent;
+ *      authorName: string;
+ *    };
+ *  }> = {
+ *    BlockQuote: (props: {
+ *      children: TinaMarkdownContent;
+ *      authorName: string;
+ *    }) => {
+ *      return (
+ *        <div>
+ *          <blockquote>
+ *            <TinaMarkdown content={props.children} />
+ *            {props.authorName}
+ *          </blockquote>
+ *        </div>
+ *      );
+ *    }
+ *  }
+ * }
+ * ```
+ */
+export declare type Components<ComponentAndProps extends object> = {
+    [K in keyof ComponentAndProps]: (props: ComponentAndProps[K]) => JSX.Element;
+} & BaseComponentSignature;
+export declare type TinaMarkdownContent = {
+    type: string;
+    children: TinaMarkdownContent[];
+};
+export declare const TinaMarkdown: ({ content, components, }: {
+    content: TinaMarkdownContent | TinaMarkdownContent[];
+    components?: Components<{}>;
+}) => JSX.Element;
+export {};