tinacms 3.13.0 → 3.14.0

package/README.md

@@ -2,9 +2,9 @@
 [![npm version](https://img.shields.io/npm/v/tinacms.svg?style=flat)](https://www.npmjs.com/package/tinacms)
 [![Build, Test, Lint for Main](https://github.com/tinacms/tinacms/actions/workflows/main.yml/badge.svg?branch=main&event=push)](https://github.com/tinacms/tinacms/actions/workflows/main.yml)
 
-# [![TINA CMS](./.github/assets/tinacms-logo-small-default.svg)](https://tina.io)
+# [![TINA CMS](https://raw.githubusercontent.com/tinacms/tinacms/main/.github/assets/tinacms-logo-small-default.svg)](https://tina.io)
 
-[![Tina Demo](./.github/assets/homepage-demo-2.gif)](https://tina.io/)
+[![Tina Demo](https://raw.githubusercontent.com/tinacms/tinacms/main/.github/assets/homepage-demo-2.gif)](https://tina.io/)
 
 Tina is a headless content management system with support for **Markdown**, MDX, JSON, YAML, and more.
 

package/dist/admin/preview-url.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Resolve a router splat into a same-origin preview path.
+ *
+ * Do not filter the splat instead: the URL parser treats `\` as `/` and drops
+ * leading tabs, so a character filter does not hold. Resolve the value first,
+ * then reject any result that left this origin.
+ *
+ * `offOrigin` is true only when a splat was supplied and resolved elsewhere, so
+ * callers can tell a rejected link from an empty one.
+ */
+export declare function resolvePreviewPath(splat: string | undefined, baseOrigin?: string): {
+    path: string;
+    offOrigin: boolean;
+};

package/dist/index.js

@@ -11115,7 +11115,7 @@ class TinaMediaStore {
     if (!this.isLocal) {
       const encodedBranch = this.encodedBranchParam();
       res = await this.api.authProvider.fetchWithToken(
-        `${this.listUrl}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${options.offset}` : ""}${encodedBranch ? `&branch=${encodedBranch}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}${((_a = options.ext) == null ? void 0 : _a.length) ? `&ext=${encodeURIComponent(options.ext.join(","))}` : ""}`
+        `${this.listUrl}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${encodeURIComponent(options.offset)}` : ""}${encodedBranch ? `&branch=${encodedBranch}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}${((_a = options.ext) == null ? void 0 : _a.length) ? `&ext=${encodeURIComponent(options.ext.join(","))}` : ""}`
       );
       if (res.status == 401) {
         throw E_UNAUTHORIZED;
@@ -11125,7 +11125,7 @@ class TinaMediaStore {
       }
     } else {
       res = await this.fetchFunction(
-        `${this.url}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${options.offset}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}${((_b = options.ext) == null ? void 0 : _b.length) ? `&ext=${encodeURIComponent(options.ext.join(","))}` : ""}`
+        `${this.url}/list/${options.directory || ""}?limit=${options.limit || 20}${options.offset ? `&cursor=${encodeURIComponent(options.offset)}` : ""}${options.search ? `&search=${encodeURIComponent(options.search)}` : ""}${((_b = options.ext) == null ? void 0 : _b.length) ? `&ext=${encodeURIComponent(options.ext.join(","))}` : ""}`
       );
       if (res.status == 404) {
         throw E_BAD_ROUTE;
@@ -14005,6 +14005,70 @@ function createCloudConfig({
     ...options
   };
 }
+const LOADING_MESSAGES = [
+  "Hang tight, TinaCMS is looking for llamas 🦙 🦙 🦙",
+  "Reticulating llama splines 🦙",
+  "Herding llamas into collections 🦙",
+  "Brushing llama fur 🦙 🦙",
+  "Teaching a llama to write frontmatter 🦙",
+  "Feeding the GraphQL llama 🦙",
+  "Counting llamas in your content folder 🦙",
+  "Asking a llama what changed in git 🦙",
+  "Llamas are proofreading your schema 🦙",
+  "Untangling markdown with llama teeth 🦙",
+  "Waking the llamas in the media library 🦙",
+  "Alphabetising llamas by collection 🦙",
+  "Convincing a llama that MDX is fine 🦙",
+  "Saddling up the content layer 🦙",
+  "Polishing the sidebar, llama style 🦙",
+  "One more llama, almost there 🦙"
+];
+const CYCLE_MS = 2e3;
+const FADE_MS = 200;
+const prefersReducedMotion = () => typeof window !== "undefined" && typeof window.matchMedia === "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+const pickOther = (current, length) => {
+  if (length < 2) return 0;
+  const offset2 = 1 + Math.floor(Math.random() * (length - 1));
+  return (current + offset2) % length;
+};
+const LoadingMessage = ({
+  className,
+  style,
+  messages = LOADING_MESSAGES
+}) => {
+  const [index, setIndex] = React__default.useState(0);
+  const [visible, setVisible] = React__default.useState(false);
+  const [reducedMotion] = React__default.useState(prefersReducedMotion);
+  React__default.useEffect(() => {
+    setIndex((current) => pickOther(current, messages.length));
+    setVisible(true);
+  }, [messages.length]);
+  React__default.useEffect(() => {
+    const fadeOut = setTimeout(() => setVisible(false), CYCLE_MS - FADE_MS);
+    const next = setTimeout(() => {
+      setIndex((current) => pickOther(current, messages.length));
+      setVisible(true);
+    }, CYCLE_MS);
+    return () => {
+      clearTimeout(fadeOut);
+      clearTimeout(next);
+    };
+  }, [index, messages.length]);
+  return /* @__PURE__ */ React__default.createElement(
+    "p",
+    {
+      className,
+      "aria-live": "polite",
+      style: {
+        ...style,
+        opacity: reducedMotion || visible ? 1 : 0,
+        transform: reducedMotion || visible ? "none" : "translateY(4px)",
+        transition: reducedMotion ? void 0 : `opacity ${FADE_MS}ms ease-out, transform ${FADE_MS}ms ease-out`
+      }
+    },
+    messages[index]
+  );
+};
 const SidebarLoadingPlaceholder = () => /* @__PURE__ */ React.createElement(
   "div",
   {
@@ -14018,7 +14082,7 @@ const SidebarLoadingPlaceholder = () => /* @__PURE__ */ React.createElement(
       animationDuration: "150ms"
     }
   },
-  /* @__PURE__ */ React.createElement("p", { className: "block pb-5" }, "Please wait while TinaCMS", /* @__PURE__ */ React.createElement("br", null), "loads your content"),
+  /* @__PURE__ */ React.createElement(LoadingMessage, { className: "block pb-5" }),
   /* @__PURE__ */ React.createElement(LoadingDots, { color: "var(--tina-color-primary)" })
 );
 class SidebarState {
@@ -14158,7 +14222,7 @@ const FormModal = ({ plugin, close: close2 }) => {
 const name = "tinacms";
 const type = "module";
 const typings = "dist/index.d.ts";
-const version = "3.13.0";
+const version = "3.14.0";
 const main = "dist/index.js";
 const module$1 = "./dist/index.js";
 const exports$1 = { ".": "./dist/index.js", "./dist/client": "./dist/client.js", "./react": "./dist/react.js", "./dist/react": "./dist/react.js", "./tina-field": "./dist/tina-field.js", "./dist/tina-field": "./dist/tina-field.js", "./dist/rich-text": "./dist/rich-text/index.js", "./dist/rich-text/static": "./dist/rich-text/static.js", "./dist/rich-text/prism": "./dist/rich-text/prism.js" };
@@ -16553,6 +16617,9 @@ const useFieldReference = (fieldName) => {
     } else {
       doc = document;
     }
+    if (!doc) {
+      return;
+    }
     const fieldEle = doc.querySelector(
       `[data-tinafield="${fieldName}"]`
     );
@@ -73902,7 +73969,7 @@ const Loader = (props) => {
         ))
       ),
       /* @__PURE__ */ React__default.createElement(
-        "p",
+        LoadingMessage,
         {
           style: {
             fontSize: "18px",
@@ -73912,8 +73979,7 @@ const Loader = (props) => {
             fontFamily: "'Inter', sans-serif",
             fontWeight: "normal"
           }
-        },
-        "Please wait, Tina is loading data..."
+        }
       )
     )
   ), props.children);
@@ -74214,7 +74280,7 @@ const LoadingPage = () => /* @__PURE__ */ React__default.createElement(React__de
       ))
     ),
     /* @__PURE__ */ React__default.createElement(
-      "p",
+      LoadingMessage,
       {
         style: {
           fontSize: "16px",
@@ -74224,8 +74290,7 @@ const LoadingPage = () => /* @__PURE__ */ React__default.createElement(React__de
           fontFamily: "'Inter', sans-serif",
           fontWeight: "normal"
         }
-      },
-      "Please wait, Tina is loading data..."
+      }
     )
   )
 ));
@@ -76172,6 +76237,24 @@ const ScreenPage = () => {
     } })));
   });
 };
+function resolvePreviewPath(splat, baseOrigin = typeof window !== "undefined" ? window.location.origin : "") {
+  if (!baseOrigin || !splat) {
+    return { path: "/", offOrigin: false };
+  }
+  try {
+    const resolved = new URL(`/${splat}`, baseOrigin);
+    if (resolved.origin !== baseOrigin) {
+      return { path: "/", offOrigin: true };
+    }
+    const path = `${resolved.pathname}${resolved.search}${resolved.hash}`;
+    if (new URL(path, baseOrigin).origin !== baseOrigin) {
+      return { path: "/", offOrigin: true };
+    }
+    return { path, offOrigin: false };
+  } catch {
+    return { path: "/", offOrigin: true };
+  }
+}
 const TROUBLESHOOTING_URL = "https://tina.io/docs/tinacloud/troubleshooting";
 const ErrorModalContent = (props) => {
   const { title, message } = props;
@@ -76251,12 +76334,23 @@ const SetPreviewFlag = ({
   return null;
 };
 const PreviewInner = ({ preview, config }) => {
+  const cms = useCMS$1();
   const params = useParams();
   const navigate = useNavigate();
-  const [url, setURL] = React__default.useState(`/${params["*"]}`);
+  const splat = params["*"];
+  const { path: paramURL, offOrigin } = resolvePreviewPath(splat);
+  const [url, setURL] = React__default.useState(paramURL);
   const [reportedURL, setReportedURL] = useState(null);
   const ref = React__default.useRef(null);
-  const paramURL = `/${params["*"]}`;
+  React__default.useEffect(() => {
+    if (!offOrigin) {
+      return;
+    }
+    cms.alerts.warn(
+      "This preview link points to a different site, so it was not opened."
+    );
+    navigate(`/~${paramURL}`, { replace: true });
+  }, [splat, offOrigin]);
   React__default.useEffect(() => {
     if (reportedURL !== paramURL && paramURL) {
       setURL(paramURL);

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

@@ -146,7 +146,7 @@ export type TinaMarkdownContent = {
 export declare const TinaMarkdown: <CustomComponents extends {
     [key: string]: object;
 } = any>({ content, components, }: {
-    content: TinaMarkdownContent | TinaMarkdownContent[];
+    content: TinaMarkdownContent | TinaMarkdownContent[] | null | undefined;
     components?: Components<{}> | Components<{ [BK in keyof CustomComponents]: (props: CustomComponents[BK]) => JSX.Element; }>;
 }) => React.JSX.Element;
 export {};

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

@@ -148,7 +148,7 @@ export type TinaMarkdownContent = {
 export declare const StaticTinaMarkdown: <CustomComponents extends {
     [key: string]: object;
 } = any>({ content, components, }: {
-    content: TinaMarkdownContent | TinaMarkdownContent[];
+    content: TinaMarkdownContent | TinaMarkdownContent[] | null | undefined;
     components?: Components<{}> | Components<{ [BK in keyof CustomComponents]: (props: CustomComponents[BK]) => JSX.Element; }>;
 }) => React.JSX.Element;
 export {};

package/dist/toolkit/components/loading-messages.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export declare const LOADING_MESSAGES: string[];
+interface LoadingMessageProps {
+    className?: string;
+    style?: React.CSSProperties;
+    messages?: string[];
+}
+export declare const LoadingMessage: ({ className, style, messages, }: LoadingMessageProps) => React.JSX.Element;
+export {};

package/dist/toolkit/fields/plugins/field-props.d.ts

@@ -3,9 +3,10 @@ import { FieldRenderProps } from '../../form-builder';
 /**
  * Props every field plugin receives.
  *
- * `react-final-form` v6 declared `[otherProp: string]: any` on `FieldRenderProps`,
- * so the extras `FieldsBuilder` passes down type-checked implicitly. v7 dropped
- * that index signature, so they are declared here instead.
+ * `react-final-form` v6 declares `[otherProp: string]: any` on `FieldRenderProps`,
+ * so the extras `FieldsBuilder` passes down would type-check implicitly. They are
+ * declared explicitly anyway: v7 drops that index signature, and the next bump
+ * should not have to rediscover them.
  */
 export interface FieldProps<InputProps> extends FieldRenderProps<any, HTMLElement> {
     field: Field & InputProps;

package/package.json

@@ -2,7 +2,7 @@
   "name": "tinacms",
   "type": "module",
   "typings": "dist/index.d.ts",
-  "version": "3.13.0",
+  "version": "3.14.0",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "exports": {
@@ -82,8 +82,8 @@
     "color-string": "^1.9.1",
     "date-fns": "4.1.0",
     "es-toolkit": "^1.42.0",
-    "final-form": "^5.0.1",
-    "final-form-arrays": "^4.0.1",
+    "final-form": "4.20.10",
+    "final-form-arrays": "^3.1.0",
     "final-form-set-field-data": "^1.0.2",
     "graphql": "15.8.0",
     "graphql-tag": "^2.12.6",
@@ -98,7 +98,7 @@
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dropzone": "14.2.3",
-    "react-final-form": "^7.0.1",
+    "react-final-form": "^6.5.9",
     "react-router-dom": "^6.30.3",
     "react-use": "^17.6.0",
     "tailwind-merge": "^2.6.0",
@@ -106,9 +106,9 @@
     "yup": "^1.6.1",
     "zod": "^3.24.2",
     "@tinacms/bridge": "^0.3.1",
-    "@tinacms/mdx": "^2.2.2",
-    "@tinacms/schema-tools": "^2.10.0",
-    "@tinacms/search": "^1.2.24"
+    "@tinacms/mdx": "^2.2.3",
+    "@tinacms/search": "^1.2.25",
+    "@tinacms/schema-tools": "^2.10.0"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.8.1",