@tinacms/app 1.1.0 → 1.1.2

package/appFiles/src/lib/machines/document-machine.ts

@@ -3,12 +3,7 @@
 */
 import { Client, Field, Form, FormOptions, TinaCMS } from 'tinacms'
 import { assign, createMachine, sendParent } from 'xstate'
-import {
-  resolveForm,
-  Templateable,
-  TinaFieldEnriched,
-  TinaSchema,
-} from 'tinacms'
+import { resolveForm, Template, TinaFieldEnriched, TinaSchema } from 'tinacms'
 
 export type FieldType = Field & TinaFieldEnriched
 export type FormValues = Record<string, unknown>
@@ -53,7 +48,7 @@ export const documentMachine =
   /** @xstate-layout N4IgpgJg5mDOIC5QAoC2BDAxgCwJYDswBKAOgNwBdd0AbXALwKgGIIB7Qs-ANzYGswJNFjyFS5KrQZMEBXpnRUOAbQAMAXUSgADm1iVcHLSAAeiAEwAWSyUsA2VQE4AzAHYArABoQAT0QAORxJHEMdLd1d7d3NXWIBfOO9hHAJiLgMpRnwWMAAnXLZckm0aRQAzQtQhDBSxdMk6LKhZHjYFJXw1TSQQXX0O4zMEKxt7JzcvXwtVd2DQu2d-ZwBGVWX-dwTEkHw2CDhjZNE0iWpGpmM+gyMeoctzbz8EVaDLUNdAtfvIze2j1NIuTA6AgTx0emu+EGiEszlUtlcdncdnMkyey3WtlC-mWjmW7ncTlRCSSNWOpDyBVylwhA1uMLhCKRKLRFlxcxC4UiSJikRJIH+Yhp-UMUPpz38j0Q6y2cSAA */
   createMachine(
     {
-      tsTypes: {} as import('./document-machine.typegen').Typegen0,
+      // tsTypes: {} as ,
       schema: {
         context: {} as ContextType,
         services: {} as {
@@ -174,14 +169,14 @@ export const documentMachine =
           const collection = schema.getCollection(
             node._internalSys.collection.name
           )
-          let template: Templateable
+          let template: Template
           if (collection.templates) {
             template = collection.templates.find((template) => {
               if (typeof template === 'string') {
                 throw new Error(`Global templates not supported`)
               }
               return template.name === node._internalSys.template
-            }) as Templateable
+            }) as Template
           } else {
             template = collection
           }

package/appFiles/src/lib/machines/query-machine.ts

@@ -564,19 +564,6 @@ export const queryMachine =
               }
             }
           })
-          if (context.cms) {
-            context.cms.events.subscribe(`forms:fields:onChange`, (event) => {
-              // Nested forms from rich-text also trigger this event
-              if (Object.keys(context.documentMap).includes(event.formId)) {
-                callback({ type: 'FIELD_CHANGE' })
-              }
-            })
-            context.cms.events.subscribe(`forms:reset`, (event) => {
-              if (Object.keys(context.documentMap).includes(event.formId)) {
-                callback({ type: 'FIELD_CHANGE' })
-              }
-            })
-          }
         },
       },
     }

package/appFiles/src/preview.tsx

@@ -51,6 +51,7 @@ export const Preview = (
         />
       )}
       <iframe
+        data-test="tina-iframe"
         id="tina-iframe"
         ref={props.iframeRef}
         className="h-screen w-full bg-white"
@@ -81,6 +82,28 @@ const QueryMachine = (props: {
   )
 
   const [state, send] = useMachine(machine)
+  React.useEffect(() => {
+    const unsubscribeFieldChange = cms.events.subscribe(
+      `forms:fields:onChange`,
+      (event) => {
+        // Nested forms from rich-text also trigger this event
+        if (Object.keys(state.context.documentMap).includes(event.formId)) {
+          send({ type: 'FIELD_CHANGE' })
+        }
+      }
+    )
+    const unsubscribeReset = cms.events.subscribe(`forms:reset`, (event) => {
+      if (Object.keys(state.context.documentMap).includes(event.formId)) {
+        send({ type: 'FIELD_CHANGE' })
+      }
+    })
+
+    return () => {
+      unsubscribeFieldChange()
+      unsubscribeReset()
+    }
+  }, [cms, state.context.documentMap])
+
   React.useEffect(() => {
     if (state.matches('pipeline.ready')) {
       cms.events.dispatch({ type: 'forms:register', value: 'complete' })

package/dist/index.js

@@ -339,6 +339,7 @@ var viteBuild = async ({
   const localBuild = l;
   const node_env = JSON.stringify(process.env.NODE_ENV);
   const generatedPath = import_path2.default.join(rootPath, ".tina", "__generated__");
+  const schemaImport = import_path2.default.join(generatedPath, "_graphql.json");
   const outputPath = import_path2.default.join(rootPath, publicFolder, outputFolder);
   const appCopyPath = import_path2.default.join(__dirname, "..", "appFiles");
   const appRootPath = import_path2.default.join(generatedPath, "app");
@@ -373,7 +374,8 @@ var viteBuild = async ({
   }
   await (0, import_vite.build)(prebuildConfig);
   const alias = {
-    TINA_IMPORT: configPrebuildPath
+    TINA_IMPORT: configPrebuildPath,
+    SCHEMA_IMPORT: schemaImport
   };
   const publicEnv = {};
   Object.keys(process.env).forEach((key) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/app",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "main": "dist/index.js",
   "exports": {
     ".": {
@@ -36,10 +36,10 @@
     "@types/fs-extra": "^9.0.1",
     "@types/react": "17.0.2",
     "@types/react-dom": "17.0.2",
-    "@tinacms/scripts": "1.0.2",
-    "tinacms": "1.2.1",
-    "@tinacms/toolkit": "1.3.3",
-    "@tinacms/mdx": "1.3.0",
+    "@tinacms/scripts": "1.0.3",
+    "tinacms": "1.3.0",
+    "@tinacms/toolkit": "1.4.0",
+    "@tinacms/mdx": "1.3.2",
     "jest": "^27.0.6"
   },
   "dependencies": {