tinacms 0.69.18 → 0.69.20

package/dist/index.d.ts

@@ -20,6 +20,7 @@ export * from '@tinacms/toolkit';
 export { TinaAdmin } from './admin';
 export { RouteMappingPlugin } from './admin/plugins/route-mapping';
 export { TinaAdminApi } from './admin/api';
+export { MdxFieldPluginExtendible } from '@tinacms/toolkit';
 import { TinaCMSProvider2, DocumentCreatorCallback } from './tina-cms';
 import type { TinaCMSProviderDefaultProps } from './types/cms';
 export type { TinaCMSProviderDefaultProps };

package/dist/index.es.js

@@ -1,5 +1,6 @@
 import { useCMS, Form, GlobalFormPlugin, EventBus, Modal, ModalPopup, ModalHeader, ModalBody, ModalActions, Button, LoadingDots, useLocalStorage, TinaCMS, BranchSwitcherPlugin, BranchDataProvider, TinaProvider, TinaMediaStore, DummyMediaStore, Nav, LocalWarning, Select, OverflowMenu, CursorPaginator, PopupModal, wrapFieldsWithMeta, FormStatus, FormBuilder } from "@tinacms/toolkit";
 export * from "@tinacms/toolkit";
+export { MdxFieldPluginExtendible } from "@tinacms/toolkit";
 import * as G from "graphql";
 import { TypeInfo, visit, visitWithTypeInfo, getNamedType, GraphQLObjectType, isLeafType, GraphQLUnionType, isScalarType as isScalarType$1, getIntrospectionQuery, buildClientSchema, print, parse } from "graphql";
 import set from "lodash.set";
@@ -4967,7 +4968,7 @@ const handleNavigate = (navigate, cms, collection, collectionDefinition, documen
     if (routeOverride.startsWith("/")) {
       routeOverride = routeOverride.slice(1);
     }
-    tinaPreview ? navigate(`/preview/${routeOverride}`) : window.location.href = routeOverride;
+    tinaPreview ? navigate(`/~/${routeOverride}`) : window.location.href = routeOverride;
     return null;
   } else {
     navigate(document._sys.breadcrumbs.join("/"));
@@ -5049,14 +5050,14 @@ const CollectionListPage = () => {
           },
           ...fields.map((x) => [
             {
-              label: x.label + " (Ascending)",
+              label: x.label || x.name + " (Ascending)",
               value: JSON.stringify({
                 name: x.name,
                 order: "asc"
               })
             },
             {
-              label: x.label + " (Descending)",
+              label: x.label || x.name + " (Descending)",
               value: JSON.stringify({
                 name: x.name,
                 order: "desc"
@@ -5555,6 +5556,18 @@ const Redirect = () => {
   }, []);
   return null;
 };
+const MaybeRedirectToPreview = ({
+  redirect,
+  children
+}) => {
+  const navigate = useNavigate();
+  React.useEffect(() => {
+    if (redirect) {
+      navigate("/~");
+    }
+  }, [redirect]);
+  return children;
+};
 const SetPreviewFlag = ({
   preview,
   cms
@@ -5580,7 +5593,7 @@ const PreviewInner = ({ preview, config }) => {
   }, [paramURL]);
   React.useEffect(() => {
     if ((reportedURL !== url || reportedURL !== paramURL) && reportedURL) {
-      navigate(`/preview${reportedURL}`);
+      navigate(`/~${reportedURL}`);
     }
   }, [reportedURL]);
   React.useEffect(() => {
@@ -5622,7 +5635,7 @@ const TinaAdmin = ({
         preview,
         cms
       }), /* @__PURE__ */ React.createElement(Routes, null, preview && /* @__PURE__ */ React.createElement(Route, {
-        path: "/preview/*",
+        path: "/~/*",
         element: /* @__PURE__ */ React.createElement(PreviewInner, {
           config,
           preview
@@ -5654,9 +5667,11 @@ const TinaAdmin = ({
         }, /* @__PURE__ */ React.createElement(ScreenPage, null))
       }), /* @__PURE__ */ React.createElement(Route, {
         path: "/",
-        element: /* @__PURE__ */ React.createElement(DefaultWrapper, {
+        element: /* @__PURE__ */ React.createElement(MaybeRedirectToPreview, {
+          redirect: !!preview
+        }, /* @__PURE__ */ React.createElement(DefaultWrapper, {
           cms
-        }, /* @__PURE__ */ React.createElement(DashboardPage, null))
+        }, /* @__PURE__ */ React.createElement(DashboardPage, null)))
       })));
     } else {
       return /* @__PURE__ */ React.createElement(Layout, null, /* @__PURE__ */ React.createElement(HashRouter, null, /* @__PURE__ */ React.createElement(Routes, null, /* @__PURE__ */ React.createElement(Route, {
@@ -5689,13 +5704,15 @@ class RouteMappingPlugin {
   }
 }
 const defineSchema = (config) => {
-  validateSchema({ config });
+  validateSchema({ schema: config });
   return config;
 };
 const defineConfig = (config) => {
+  validateSchema({ schema: config.schema });
   return config;
 };
 const defineStaticConfig = (config) => {
+  validateSchema({ schema: config.schema });
   return config;
 };
 export { AuthWallInner, Client, DEFAULT_LOCAL_TINA_GQL_SERVER_URL, LocalClient, RouteMappingPlugin, TinaAdmin, TinaAdminApi, TinaCMSProvider2, TinaCloudAuthWall, TinaCloudProvider, TinaDataProvider, assertShape, createClient, TinaCMSProvider2 as default, defineConfig, defineSchema, defineStaticConfig, getStaticPropsForTina, gql, safeAssertShape, staticRequest, useDocumentCreatorPlugin, useGraphqlForms, useTinaAuthRedirect };

package/dist/index.js

@@ -4984,7 +4984,7 @@ This will work when developing locally but NOT when deployed to production.
       if (routeOverride.startsWith("/")) {
         routeOverride = routeOverride.slice(1);
       }
-      tinaPreview ? navigate(`/preview/${routeOverride}`) : window.location.href = routeOverride;
+      tinaPreview ? navigate(`/~/${routeOverride}`) : window.location.href = routeOverride;
       return null;
     } else {
       navigate(document._sys.breadcrumbs.join("/"));
@@ -5066,14 +5066,14 @@ This will work when developing locally but NOT when deployed to production.
             },
             ...fields.map((x) => [
               {
-                label: x.label + " (Ascending)",
+                label: x.label || x.name + " (Ascending)",
                 value: JSON.stringify({
                   name: x.name,
                   order: "asc"
                 })
               },
               {
-                label: x.label + " (Descending)",
+                label: x.label || x.name + " (Descending)",
                 value: JSON.stringify({
                   name: x.name,
                   order: "desc"
@@ -5572,6 +5572,18 @@ This will work when developing locally but NOT when deployed to production.
     }, []);
     return null;
   };
+  const MaybeRedirectToPreview = ({
+    redirect,
+    children
+  }) => {
+    const navigate = reactRouterDom.useNavigate();
+    React__default["default"].useEffect(() => {
+      if (redirect) {
+        navigate("/~");
+      }
+    }, [redirect]);
+    return children;
+  };
   const SetPreviewFlag = ({
     preview,
     cms
@@ -5597,7 +5609,7 @@ This will work when developing locally but NOT when deployed to production.
     }, [paramURL]);
     React__default["default"].useEffect(() => {
       if ((reportedURL !== url || reportedURL !== paramURL) && reportedURL) {
-        navigate(`/preview${reportedURL}`);
+        navigate(`/~${reportedURL}`);
       }
     }, [reportedURL]);
     React__default["default"].useEffect(() => {
@@ -5639,7 +5651,7 @@ This will work when developing locally but NOT when deployed to production.
           preview,
           cms
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Routes, null, preview && /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
-          path: "/preview/*",
+          path: "/~/*",
           element: /* @__PURE__ */ React__default["default"].createElement(PreviewInner, {
             config,
             preview
@@ -5671,9 +5683,11 @@ This will work when developing locally but NOT when deployed to production.
           }, /* @__PURE__ */ React__default["default"].createElement(ScreenPage, null))
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
           path: "/",
-          element: /* @__PURE__ */ React__default["default"].createElement(DefaultWrapper, {
+          element: /* @__PURE__ */ React__default["default"].createElement(MaybeRedirectToPreview, {
+            redirect: !!preview
+          }, /* @__PURE__ */ React__default["default"].createElement(DefaultWrapper, {
             cms
-          }, /* @__PURE__ */ React__default["default"].createElement(DashboardPage, null))
+          }, /* @__PURE__ */ React__default["default"].createElement(DashboardPage, null)))
         })));
       } else {
         return /* @__PURE__ */ React__default["default"].createElement(Layout, null, /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.HashRouter, null, /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Routes, null, /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
@@ -5706,15 +5720,23 @@ This will work when developing locally but NOT when deployed to production.
     }
   }
   const defineSchema = (config) => {
-    schemaTools.validateSchema({ config });
+    schemaTools.validateSchema({ schema: config });
     return config;
   };
   const defineConfig = (config) => {
+    schemaTools.validateSchema({ schema: config.schema });
     return config;
   };
   const defineStaticConfig = (config) => {
+    schemaTools.validateSchema({ schema: config.schema });
     return config;
   };
+  Object.defineProperty(exports2, "MdxFieldPluginExtendible", {
+    enumerable: true,
+    get: function() {
+      return toolkit.MdxFieldPluginExtendible;
+    }
+  });
   Object.defineProperty(exports2, "NAMER", {
     enumerable: true,
     get: function() {

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

@@ -62,7 +62,7 @@ declare type BaseComponents = {
     };
     code_block?: {
         lang?: string;
-        children: JSX.Element;
+        value: string;
     };
     img?: {
         url: string;

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

@@ -154,7 +154,7 @@ const Node = ({ components, child }) => {
         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":

package/dist/rich-text/index.js

@@ -161,7 +161,7 @@
           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":

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

@@ -0,0 +1,16 @@
+/**
+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.
+*/
+export declare const Prism: (props: {
+    value: string;
+    lang?: string;
+}) => JSX.Element;

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

@@ -0,0 +1,72 @@
+import React from "react";
+import Highlight, { defaultProps } from "prism-react-renderer";
+var theme = {
+  plain: {
+    color: "#393A34",
+    backgroundColor: "#f6f8fa"
+  },
+  styles: [{
+    types: ["comment", "prolog", "doctype", "cdata"],
+    style: {
+      color: "#999988",
+      fontStyle: "italic"
+    }
+  }, {
+    types: ["namespace"],
+    style: {
+      opacity: 0.7
+    }
+  }, {
+    types: ["string", "attr-value"],
+    style: {
+      color: "#e3116c"
+    }
+  }, {
+    types: ["punctuation", "operator"],
+    style: {
+      color: "#393A34"
+    }
+  }, {
+    types: ["entity", "url", "symbol", "number", "boolean", "variable", "constant", "property", "regex", "inserted"],
+    style: {
+      color: "#36acaa"
+    }
+  }, {
+    types: ["atrule", "keyword", "attr-name", "selector"],
+    style: {
+      color: "#00a4db"
+    }
+  }, {
+    types: ["function", "deleted", "tag"],
+    style: {
+      color: "#d73a49"
+    }
+  }, {
+    types: ["function-variable"],
+    style: {
+      color: "#6f42c1"
+    }
+  }, {
+    types: ["tag", "selector", "keyword"],
+    style: {
+      color: "#00009f"
+    }
+  }]
+};
+var theme$1 = theme;
+const Prism = (props) => {
+  return /* @__PURE__ */ React.createElement(Highlight, {
+    ...defaultProps,
+    theme: theme$1,
+    code: props.value,
+    language: props.lang
+  }, ({ className, style, tokens, getLineProps, getTokenProps }) => /* @__PURE__ */ React.createElement("pre", {
+    className,
+    style
+  }, tokens.map((line, i) => /* @__PURE__ */ React.createElement("div", {
+    ...getLineProps({ line, key: i })
+  }, line.map((token, key) => /* @__PURE__ */ React.createElement("span", {
+    ...getTokenProps({ token, key })
+  }))))));
+};
+export { Prism };

package/dist/rich-text/prism.js

@@ -0,0 +1,81 @@
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("prism-react-renderer")) : typeof define === "function" && define.amd ? define(["exports", "react", "prism-react-renderer"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP, global.NOOP));
+})(this, function(exports2, React, Highlight) {
+  "use strict";
+  function _interopDefaultLegacy(e) {
+    return e && typeof e === "object" && "default" in e ? e : { "default": e };
+  }
+  var React__default = /* @__PURE__ */ _interopDefaultLegacy(React);
+  var Highlight__default = /* @__PURE__ */ _interopDefaultLegacy(Highlight);
+  var theme = {
+    plain: {
+      color: "#393A34",
+      backgroundColor: "#f6f8fa"
+    },
+    styles: [{
+      types: ["comment", "prolog", "doctype", "cdata"],
+      style: {
+        color: "#999988",
+        fontStyle: "italic"
+      }
+    }, {
+      types: ["namespace"],
+      style: {
+        opacity: 0.7
+      }
+    }, {
+      types: ["string", "attr-value"],
+      style: {
+        color: "#e3116c"
+      }
+    }, {
+      types: ["punctuation", "operator"],
+      style: {
+        color: "#393A34"
+      }
+    }, {
+      types: ["entity", "url", "symbol", "number", "boolean", "variable", "constant", "property", "regex", "inserted"],
+      style: {
+        color: "#36acaa"
+      }
+    }, {
+      types: ["atrule", "keyword", "attr-name", "selector"],
+      style: {
+        color: "#00a4db"
+      }
+    }, {
+      types: ["function", "deleted", "tag"],
+      style: {
+        color: "#d73a49"
+      }
+    }, {
+      types: ["function-variable"],
+      style: {
+        color: "#6f42c1"
+      }
+    }, {
+      types: ["tag", "selector", "keyword"],
+      style: {
+        color: "#00009f"
+      }
+    }]
+  };
+  var theme$1 = theme;
+  const Prism = (props) => {
+    return /* @__PURE__ */ React__default["default"].createElement(Highlight__default["default"], {
+      ...Highlight.defaultProps,
+      theme: theme$1,
+      code: props.value,
+      language: props.lang
+    }, ({ className, style, tokens, getLineProps, getTokenProps }) => /* @__PURE__ */ React__default["default"].createElement("pre", {
+      className,
+      style
+    }, tokens.map((line, i) => /* @__PURE__ */ React__default["default"].createElement("div", {
+      ...getLineProps({ line, key: i })
+    }, line.map((token, key) => /* @__PURE__ */ React__default["default"].createElement("span", {
+      ...getTokenProps({ token, key })
+    }))))));
+  };
+  exports2.Prism = Prism;
+  Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.69.18",
+  "version": "0.69.20",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -43,6 +43,7 @@
       "src/index.ts",
       "src/edit-state.tsx",
       "src/rich-text/index.tsx",
+      "src/rich-text/prism.tsx",
       "src/react.tsx",
       "src/client.ts"
     ]
@@ -54,9 +55,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "0.1.8",
+    "@tinacms/schema-tools": "0.1.9",
     "@tinacms/sharedctx": "0.1.3",
-    "@tinacms/toolkit": "0.58.1",
+    "@tinacms/toolkit": "0.58.2",
     "crypto-js": "^4.0.0",
     "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",