@tinacms/app 0.0.0-c312c38-20250414065513 → 0.0.0-c466c52-20250801052040

package/CHANGELOG.md

@@ -1,13 +1,81 @@
 # @tinacms/app
 
-## 0.0.0-c312c38-20250414065513
+## 0.0.0-c466c52-20250801052040
 
 ### Patch Changes
 
-- [#5623](https://github.com/tinacms/tinacms/pull/5623) [`613fbf0`](https://github.com/tinacms/tinacms/commit/613fbf04bd3ebcc0dbfdfadecc07f5e1068408e4) Thanks [@JackDevAU](https://github.com/JackDevAU)! - ⚠️ TESTING
+- Updated dependencies [[`eaa6ed5`](https://github.com/tinacms/tinacms/commit/eaa6ed551c76349c5849cd1e19a8066ecbbe205c), [`60a15d5`](https://github.com/tinacms/tinacms/commit/60a15d533b85a0c3f9f483f6f0f0b6824616284b)]:
+  - tinacms@0.0.0-c466c52-20250801052040
+  - @tinacms/mdx@0.0.0-c466c52-20250801052040
 
-- Updated dependencies [[`613fbf0`](https://github.com/tinacms/tinacms/commit/613fbf04bd3ebcc0dbfdfadecc07f5e1068408e4)]:
-  - tinacms@0.0.0-c312c38-20250414065513
+## 2.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`41359ed`](https://github.com/tinacms/tinacms/commit/41359edaf08def7a5e26969ec114155038c09752), [`b20a2c4`](https://github.com/tinacms/tinacms/commit/b20a2c4fd64fa2d06711850db63fb317302ee361), [`41359ed`](https://github.com/tinacms/tinacms/commit/41359edaf08def7a5e26969ec114155038c09752)]:
+  - tinacms@2.8.1
+
+## 2.3.0
+
+### Minor Changes
+
+- [#5744](https://github.com/tinacms/tinacms/pull/5744) [`98a61e2`](https://github.com/tinacms/tinacms/commit/98a61e2d263978a7096cc23ac7e94aa0039981be) Thanks [@Ben0189](https://github.com/Ben0189)! - Upgrade Plate editor to v48 beta, integrating latest features and improvements.
+
+### Patch Changes
+
+- Updated dependencies [[`98a61e2`](https://github.com/tinacms/tinacms/commit/98a61e2d263978a7096cc23ac7e94aa0039981be)]:
+  - @tinacms/mdx@1.8.0
+  - tinacms@2.8.0
+
+## 2.2.10
+
+### Patch Changes
+
+- [#5833](https://github.com/tinacms/tinacms/pull/5833) [`5269d65`](https://github.com/tinacms/tinacms/commit/5269d6578d361c55326f39375eaa175707342d51) Thanks [@JackDevAU](https://github.com/JackDevAU)! - 🐛 FIX - Visual Editor Webpack HMR loading issue
+
+- Updated dependencies [[`5269d65`](https://github.com/tinacms/tinacms/commit/5269d6578d361c55326f39375eaa175707342d51), [`3026a2b`](https://github.com/tinacms/tinacms/commit/3026a2b492113a53c036e43d5d85837cea4a6de3), [`28a94a6`](https://github.com/tinacms/tinacms/commit/28a94a602186f48b528b91236007839e5d02a9de)]:
+  - tinacms@2.7.10
+
+## 2.2.9
+
+### Patch Changes
+
+- [#5741](https://github.com/tinacms/tinacms/pull/5741) [`0e9de37`](https://github.com/tinacms/tinacms/commit/0e9de379dab2970206b9b60eb014808662f67287) Thanks [@wicksipedia](https://github.com/wicksipedia)! - CMS admin UI - Refactor Sidebar and Branch Button Components
+  Forms header - Adds breadcrumb navigation
+
+- [#5784](https://github.com/tinacms/tinacms/pull/5784) [`b25c5f0`](https://github.com/tinacms/tinacms/commit/b25c5f0b0e1d3f37870b780230b41dbc56bef1ab) Thanks [@JackDevAU](https://github.com/JackDevAU)! - - Fixed padding issues in FormLists
+
+  - Fixed Visual Editing's "Edit" button (Reference Fields)
+
+- [#5789](https://github.com/tinacms/tinacms/pull/5789) [`5040a6a`](https://github.com/tinacms/tinacms/commit/5040a6aa24e62166d942c47b61a3f18585caded6) Thanks [@JackDevAU](https://github.com/JackDevAU)! - ✨ Adds click to focus for nested objects
+
+- Updated dependencies [[`2a3ed6c`](https://github.com/tinacms/tinacms/commit/2a3ed6c3ec3233fd90fd94f3dd3d0243aaad079a), [`bc47f93`](https://github.com/tinacms/tinacms/commit/bc47f938431c400714808613f633b05659a87be1), [`0e9de37`](https://github.com/tinacms/tinacms/commit/0e9de379dab2970206b9b60eb014808662f67287), [`468f0ee`](https://github.com/tinacms/tinacms/commit/468f0eefc0a15a9a9a23737d29ea9a5cb5c6aef6), [`e27c017`](https://github.com/tinacms/tinacms/commit/e27c0172005797af93b908152d51b2966c0cf059), [`b25c5f0`](https://github.com/tinacms/tinacms/commit/b25c5f0b0e1d3f37870b780230b41dbc56bef1ab), [`5040a6a`](https://github.com/tinacms/tinacms/commit/5040a6aa24e62166d942c47b61a3f18585caded6), [`dbef36f`](https://github.com/tinacms/tinacms/commit/dbef36f594b949024d5525184b6a9e1b9085b759), [`3ba6d78`](https://github.com/tinacms/tinacms/commit/3ba6d78f35f817d55bfc3d12b750e54b7e0d11f2)]:
+  - tinacms@2.7.9
+  - @tinacms/mdx@1.7.0
+
+## 2.2.8
+
+### Patch Changes
+
+- Updated dependencies [[`5e36123`](https://github.com/tinacms/tinacms/commit/5e361239a372e21dda624d17b4ff274bab23ce90), [`856e07a`](https://github.com/tinacms/tinacms/commit/856e07a0b8d742ee78d5eba565623cf081a61534), [`4d9c8ab`](https://github.com/tinacms/tinacms/commit/4d9c8abf6badd1bcc833bda432ab22dace4925ae), [`7346dc9`](https://github.com/tinacms/tinacms/commit/7346dc996fd81ecb395b62f373976512e8224c21)]:
+  - tinacms@2.7.8
+  - @tinacms/mdx@1.6.3
+
+## 2.2.7
+
+### Patch Changes
+
+- [#5607](https://github.com/tinacms/tinacms/pull/5607) [`1965236`](https://github.com/tinacms/tinacms/commit/19652363784e48b065ec1924a9cd9611c8e79cae) Thanks [@jeffsee55](https://github.com/jeffsee55)! - Specify react and react-dom as peer deps
+
+- Updated dependencies [[`1965236`](https://github.com/tinacms/tinacms/commit/19652363784e48b065ec1924a9cd9611c8e79cae)]:
+  - tinacms@2.7.7
+
+## 2.2.6
+
+### Patch Changes
+
+- Updated dependencies [[`65cee5d`](https://github.com/tinacms/tinacms/commit/65cee5d6ae16c7320a4a14f0d9a82dc5f9103e34)]:
+  - tinacms@2.7.6
 
 ## 2.2.5
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/app",
-  "version": "0.0.0-c312c38-20250414065513",
+  "version": "0.0.0-c466c52-20250801052040",
   "main": "src/main.tsx",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -8,6 +8,10 @@
     "@types/react-dom": "^18.3.5",
     "typescript": "^5.7.3"
   },
+  "peerDependencies": {
+    "react": ">=18.3.1 <20.0.0",
+    "react-dom": ">=18.3.1 <20.0.0"
+  },
   "dependencies": {
     "@graphiql/toolkit": "0.8.4",
     "@headlessui/react": "2.1.8",
@@ -22,7 +26,7 @@
     "react-router-dom": "6.3.0",
     "typescript": "^5.7.3",
     "zod": "^3.24.2",
-    "@tinacms/mdx": "1.6.2",
-    "tinacms": "0.0.0-c312c38-20250414065513"
+    "@tinacms/mdx": "0.0.0-c466c52-20250801052040",
+    "tinacms": "0.0.0-c466c52-20250801052040"
   }
 }

package/src/Playground.tsx

@@ -100,7 +100,7 @@ const Playground = () => {
                         false
                           ? 'bg-gray-100 text-gray-900'
                           : 'text-gray-600 hover:bg-gray-50 hover:text-gray-900',
-                        'flex items-center rounded-md px-3 py-2 text-sm font-medium w-full text-left'
+                        'flex items-center rounded px-3 py-2 text-sm font-medium w-full text-left'
                       )}
                       onClick={async () => {
                         if (typeof value === 'function') {

package/src/fields/rich-text/monaco/error-message.tsx

@@ -1,16 +1,16 @@
-/**
-
-
-
-*/
-import React from 'react';
-import { XCircleIcon } from '@heroicons/react/solid';
 import {
   Popover,
   PopoverButton,
   PopoverPanel,
   Transition,
 } from '@headlessui/react';
+import { XCircleIcon } from '@heroicons/react/solid';
+/**
+
+
+
+*/
+import React from 'react';
 import { Fragment } from 'react';
 // import { InvalidMarkdownElement } from '@tinacms/mdx/src/parse/plate'
 export type EmptyTextElement = { type: 'text'; text: '' };
@@ -93,7 +93,7 @@ export function ErrorMessage({ error }: { error: InvalidMarkdownElement }) {
           >
             <PopoverPanel className='absolute top-8 w-[300px] -right-3 z-10 mt-3 px-4 sm:px-0'>
               <div className='overflow-hidden rounded-lg shadow-lg ring-1 ring-black ring-opacity-5'>
-                <div className='rounded-md bg-red-50 p-4 overflow-scroll'>
+                <div className='rounded bg-red-50 p-4 overflow-scroll'>
                   <div className='flex'>
                     <div className='flex-shrink-0'>
                       <XCircleIcon

package/src/fields/rich-text/monaco/index.tsx

@@ -1,19 +1,13 @@
-/**
-
-
-
-*/
-
-import MonacoEditor, { loader } from '@monaco-editor/react';
+import React from 'react';
+import MonacoEditor, { useMonaco, loader } from '@monaco-editor/react';
 /**
  * MDX is built directly to the app because of how we load dependencies.
  * Since we drop the package.json in to the end users folder, we can't
  * easily install the current version of the mdx package in all scenarios
  * (when we're working in the monorepo, or working with a tagged npm version)
  */
-import { parseMDX, stringifyMDX } from '@tinacms/mdx';
+import { parseMDX, serializeMDX } from '@tinacms/mdx';
 import type * as monaco from 'monaco-editor';
-import React from 'react';
 import { RichTextType } from 'tinacms';
 import {
   ErrorMessage,
@@ -21,7 +15,6 @@ import {
   buildError,
 } from './error-message';
 import { useDebounce } from './use-debounce';
-import useCustomMonaco from './use-monaco';
 
 export const uuid = () => {
   // @ts-ignore
@@ -35,11 +28,6 @@ export const uuid = () => {
 
 type Monaco = typeof monaco;
 
-// 0.33.0 has a bug https://github.com/microsoft/monaco-editor/issues/2947
-loader.config({
-  paths: { vs: 'https://cdn.jsdelivr.net/npm/monaco-editor@0.31.1/min/vs' },
-});
-
 /**
  * Since monaco lazy-loads we may have a delay from when the block is inserted
  * to when monaco has intantiated, keep trying to focus on it.
@@ -61,7 +49,7 @@ const retryFocus = (ref) => {
 };
 
 export const RawEditor = (props: RichTextType) => {
-  const monaco = useCustomMonaco() as Monaco;
+  const monaco = useMonaco() as Monaco;
   const monacoEditorRef =
     React.useRef<monaco.editor.IStandaloneCodeEditor>(null);
   const [height, setHeight] = React.useState(100);
@@ -69,7 +57,7 @@ export const RawEditor = (props: RichTextType) => {
   const field = props.field;
   const inputValue = React.useMemo(() => {
     // @ts-ignore no access to the rich-text type from this package
-    const res = stringifyMDX(props.input.value, field, (value) => value);
+    const res = serializeMDX(props.input.value, field, (value) => value);
     return typeof props.input.value === 'string' ? props.input.value : res;
   }, []);
   const [value, setValue] = React.useState(inputValue);
@@ -150,13 +138,17 @@ export const RawEditor = (props: RichTextType) => {
     monacoEditor: monaco.editor.IStandaloneCodeEditor,
     monaco: Monaco
   ) {
-    monacoEditorRef.current = monacoEditor;
-    monacoEditor.onDidContentSizeChange(() => {
-      // FIXME: if the window is too tall the performance degrades, come up with a nice
-      // balance between the two
-      setHeight(Math.min(Math.max(100, monacoEditor.getContentHeight()), 1000));
-      monacoEditor.layout();
-    });
+    if (monacoEditor) {
+      monacoEditorRef.current = monacoEditor;
+      monacoEditor.onDidContentSizeChange(() => {
+        // FIXME: if the window is too tall the performance degrades, come up with a nice
+        // balance between the two
+        setHeight(
+          Math.min(Math.max(100, monacoEditor.getContentHeight()), 1000)
+        );
+        monacoEditor.layout();
+      });
+    }
   }
 
   return (
@@ -169,6 +161,9 @@ export const RawEditor = (props: RichTextType) => {
       </div>
       <div style={{ height: `${height}px` }}>
         <MonacoEditor
+          beforeMount={() => {}}
+          height='100%'
+          width='100%'
           path={id}
           onMount={handleEditorDidMount}
           // Setting a custom theme is kind of buggy because it doesn't get defined until monaco has mounted.
@@ -220,10 +215,8 @@ const Button = (props) => {
   return (
     <button
       className={`${
-        props.align === 'left'
-          ? 'rounded-l-md border-r-0'
-          : 'rounded-r-md border-l-0'
-      } flex justify-center w-full shadow rounded-md bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-blue-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500`}
+        props.align === 'left' ? 'rounded-l border-r-0' : 'rounded-r border-l-0'
+      } flex justify-center w-full shadow rounded bg-white cursor-pointer relative inline-flex items-center px-2 py-2 border border-gray-200 hover:text-white text-sm font-medium transition-all ease-out duration-150 hover:bg-blue-500 focus:z-10 focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-blue-500`}
       type='button'
       onClick={props.onClick}
     >

package/src/index.css

@@ -13,6 +13,10 @@
   fill: currentColor;
 }
 
+.font-libre-baskerville {
+  font-family: "Libre Baskerville", serif;
+}
+
 body {
   margin: 0;
   padding: 0;

package/src/lib/expand-query.ts

@@ -103,12 +103,11 @@ const addMetadataField = (
         kind: 'SelectionSet',
         selections: [],
       }),
-      selections:
-        [
-          ...(node.selectionSet?.selections || []),
-          METADATA_FIELD,
-          CONTENT_SOURCE_FIELD,
-        ] || [],
+      selections: [
+        ...(node.selectionSet?.selections || []),
+        METADATA_FIELD,
+        CONTENT_SOURCE_FIELD,
+      ],
     },
   };
 };
@@ -127,8 +126,7 @@ const addMetaFieldsToQuery = (
           kind: 'SelectionSet',
           selections: [],
         }),
-        selections:
-          [...(node.selectionSet?.selections || []), ...metaFields] || [],
+        selections: [...(node.selectionSet?.selections || []), ...metaFields],
       },
     };
   };
@@ -242,6 +240,7 @@ export const isNodeType = (type: G.GraphQLOutputType) => {
       return true;
     }
   }
+  return false;
 };
 
 export const isConnectionType = (type: G.GraphQLOutputType) => {
@@ -270,4 +269,5 @@ export const isConnectionType = (type: G.GraphQLOutputType) => {
       return true;
     }
   }
+  return false;
 };

package/src/lib/graphql-reducer.ts

@@ -45,7 +45,7 @@ const sysSchema = z.object({
   collection: z.object({
     name: z.string(),
     slug: z.string(),
-    label: z.string(),
+    label: z.string().optional().nullable(),
     path: z.string(),
     format: z.string().optional().nullable(),
     matches: z.string().optional().nullable(),
@@ -305,6 +305,7 @@ export const useGraphQLReducer = (
               prefix: '',
             };
           }
+
           if (isConnectionType(info.returnType)) {
             const name = G.getNamedType(info.returnType).name;
             const connectionCollection = tinaSchema
@@ -339,6 +340,7 @@ export const useGraphQLReducer = (
               const maybeResolvedDocument = resolvedDocuments.find(
                 (doc) => doc._internalSys.path === value
               );
+
               // If we already have this document, use it.
               if (maybeResolvedDocument) {
                 resolvedDocument = maybeResolvedDocument;
@@ -349,6 +351,7 @@ export const useGraphQLReducer = (
                 // here and just grab it from the response
                 const maybeResolvedDocument =
                   documentSchema.parse(valueFromSetup);
+
                 if (maybeResolvedDocument._internalSys.path === value) {
                   resolvedDocument = maybeResolvedDocument;
                 } else {
@@ -559,12 +562,14 @@ export const useGraphQLReducer = (
           payload,
         ]);
       }
-      if (event.data.type === 'url-changed') {
-        cms.dispatch({
-          type: 'sidebar:set-loading-state',
-          value: true,
-        });
-      }
+      // TODO: This is causing a webpack HMR issue - look into refactoring this logic
+      // if (event.data.type === 'url-changed') {
+      //   console.log('[EVENT_TRIGGERED] url-changed: ', event);
+      //   cms.dispatch({
+      //     type: 'sidebar:set-loading-state',
+      //     value: true,
+      //   });
+      // }
     },
     [cms, JSON.stringify(results)]
   );

package/src/lib/util.ts

@@ -108,27 +108,22 @@ export const getFormAndFieldNameFromMetadata = (
   object: object,
   eventFieldName: string
 ) => {
-  let formId;
-  let n;
-  const value = getDeepestMetadata(object, eventFieldName);
-  if (value) {
-    if (value.prefix) {
-      const fieldName = eventFieldName.slice(value?.prefix?.length + 1);
-      const localFieldName = value.name
-        ? fieldName.slice(value?.name?.length + 1)
-        : fieldName;
-      if (localFieldName) {
-        // If localFieldName is tags.2, just use `tags`
-        if (!isNaN(Number(localFieldName.split('.')[1]))) {
-          n = value.fields[localFieldName.split('.')[0]];
-        } else {
-          n = value.fields[localFieldName];
-        }
-      } else {
-        n = value.name;
-      }
-      formId = value.id;
-    }
+  const metadata = getDeepestMetadata(object, eventFieldName);
+
+  if (!metadata) {
+    console.warn(
+      '[getFormAndFieldNameFromMetadata] No metadata found for:',
+      eventFieldName
+    );
+    return { formId: undefined, fieldName: undefined };
   }
-  return { formId, fieldName: n };
+
+  const { id: formId, prefix } = metadata;
+  const prefixLength = prefix?.length ?? 0;
+  const localFieldName = eventFieldName.slice(prefixLength + 1);
+
+  return {
+    formId,
+    fieldName: localFieldName,
+  };
 };

package/src/fields/rich-text/monaco/use-monaco.tsx

@@ -1,53 +0,0 @@
-import { loader } from '@monaco-editor/react';
-import * as monaco from 'monaco-editor';
-// hooks/useCustomMonaco.ts
-import { useEffect, useRef, useState } from 'react';
-
-export function useCustomMonaco() {
-  const [monacoInstance, setMonacoInstance] = useState<typeof monaco | null>(
-    null
-  );
-  const mountedRef = useRef(true);
-  const loaderRef = useRef<any>(null);
-
-  useEffect(() => {
-    const instance = loader.__getMonacoInstance();
-
-    if (instance) {
-      setMonacoInstance(instance);
-      return;
-    }
-
-    if (!loaderRef.current) {
-      loader.config({
-        'vs/nls': { availableLanguages: {} },
-      });
-
-      try {
-        loaderRef.current = loader.init();
-
-        loaderRef.current
-          .then((monacoApi: typeof monaco) => {
-            if (mountedRef.current) {
-              setMonacoInstance(monacoApi);
-            }
-          })
-          .catch((error: any) => {
-            if (mountedRef.current && error.type !== 'cancelation') {
-              console.error('Monaco initialization error:', error);
-            }
-          });
-      } catch (err) {
-        console.error('Failed to initialize Monaco:', err);
-      }
-    }
-
-    return () => {
-      mountedRef.current = false;
-    };
-  }, []);
-
-  return monacoInstance;
-}
-
-export default useCustomMonaco;