tinacms 0.69.22 → 0.70.1

package/dist/edit-state.d.ts

@@ -10,14 +10,33 @@ 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.
 */
-import { isEditing, setEditing, useEditState } from '@tinacms/sharedctx';
+import { isEditing, setEditing } from '@tinacms/sharedctx';
 import React from 'react';
+/**
+ * @deprecated since version 1.0.
+ * Use "import { useEditState } from 'tinacms/dist/react'" instead.
+ * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+ */
+declare const useEditState: () => {
+    edit: any;
+    setEdit: any;
+};
 export { isEditing, setEditing, useEditState };
+/**
+ * @deprecated since version 1.0.
+ * Tina no longer requires wrapping your site in the TinaProvider
+ * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+ */
 export declare const TinaEditProvider: ({ showEditButton, ...props }: {
     showEditButton?: boolean;
     children: React.ReactNode;
     editMode: React.ReactNode;
 }) => JSX.Element;
+/**
+ * @deprecated since version 1.0.
+ * Use "import { useTina } from 'tinacms/dist/react'" instead.
+ * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+ */
 export declare function useTina<T extends object>({ query, variables, data, }: {
     query: string;
     variables: object;

package/dist/edit-state.es.js

@@ -1,6 +1,7 @@
-import { EditProvider, TinaDataContext, useEditState } from "@tinacms/sharedctx";
-export { isEditing, setEditing, useEditState } from "@tinacms/sharedctx";
+import { useEditState as useEditState$1, EditProvider, TinaDataContext } from "@tinacms/sharedctx";
+export { isEditing, setEditing } from "@tinacms/sharedctx";
 import React, { useState, useEffect } from "react";
+const useEditState = useEditState$1;
 const TinaEditProvider = ({
   showEditButton,
   ...props
@@ -14,6 +15,13 @@ function useTina({
   variables,
   data
 }) {
+  React.useEffect(() => {
+    console.warn(`
+  "useTina" from 'tinacms/dist/edit-state' is now deprecated
+  * Use "import { useTina } from 'tinacms/dist/react" instead.
+  * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+  `);
+  }, []);
   const {
     setRequest,
     state,
@@ -78,4 +86,4 @@ const TinaEditProviderInner = ({ children, editMode }) => {
   }
   return children;
 };
-export { TinaEditProvider, useTina };
+export { TinaEditProvider, useEditState, useTina };

package/dist/edit-state.js

@@ -6,6 +6,7 @@
     return e && typeof e === "object" && "default" in e ? e : { "default": e };
   }
   var React__default = /* @__PURE__ */ _interopDefaultLegacy(React);
+  const useEditState = sharedctx.useEditState;
   const TinaEditProvider = ({
     showEditButton,
     ...props
@@ -19,6 +20,13 @@
     variables,
     data
   }) {
+    React__default["default"].useEffect(() => {
+      console.warn(`
+  "useTina" from 'tinacms/dist/edit-state' is now deprecated
+  * Use "import { useTina } from 'tinacms/dist/react" instead.
+  * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+  `);
+    }, []);
     const {
       setRequest,
       state,
@@ -44,7 +52,7 @@
     };
   }
   const ToggleButton = () => {
-    const { edit } = sharedctx.useEditState();
+    const { edit } = useEditState();
     const [isOnAdmin, setIsOnAdmin] = React__default["default"].useState(false);
     React__default["default"].useEffect(() => {
       var _a;
@@ -73,7 +81,7 @@
     }, "Edit with Tina"));
   };
   const TinaEditProviderInner = ({ children, editMode }) => {
-    const { edit } = sharedctx.useEditState();
+    const { edit } = useEditState();
     const [isBrowser, setIsBrowser] = React__default["default"].useState(false);
     React__default["default"].useEffect(() => {
       setIsBrowser(true);
@@ -95,13 +103,8 @@
       return sharedctx.setEditing;
     }
   });
-  Object.defineProperty(exports2, "useEditState", {
-    enumerable: true,
-    get: function() {
-      return sharedctx.useEditState;
-    }
-  });
   exports2.TinaEditProvider = TinaEditProvider;
+  exports2.useEditState = useEditState;
   exports2.useTina = useTina;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });

package/dist/hooks/formify/spec/schema.d.ts

@@ -1,3 +1,3 @@
-declare const schema: import("../../..").TinaCloudSchema;
-export declare const tinaConfig: Omit<import("../../..").TinaCMSProviderDefaultProps, "children">;
+declare const schema: any;
+export declare const tinaConfig: import("@tinacms/schema-tools/dist/types").Config<(cms: import("@tinacms/toolkit/dist/tina-cms").TinaCMS) => import("@tinacms/toolkit/dist/tina-cms").TinaCMS, import("../../use-graphql-forms").formifyCallback, import("../../use-content-creator").DocumentCreatorArgs, undefined>;
 export default schema;

package/dist/index.d.ts

@@ -27,14 +27,46 @@ export type { TinaCMSProviderDefaultProps };
 export default TinaCMSProvider2;
 import { TinaCMS } from '@tinacms/toolkit';
 import { formifyCallback } from './hooks/use-graphql-forms';
-import type { TinaCloudSchema as TinaCloudSchemaBase, TinaCloudCollection as TinaCloudCollectionBase, TinaCloudTemplateBase, TinaTemplate, TinaFieldBase, TinaCMSConfig } from '@tinacms/schema-tools';
 export { NAMER, resolveForm } from '@tinacms/schema-tools';
-export type { TinaFieldEnriched, TinaSchema, Template, Templateable, } from '@tinacms/schema-tools';
-export declare type TinaCloudSchema = TinaCloudSchemaBase<false>;
-export declare type TinaCloudCollection = TinaCloudCollectionBase<false>;
-export declare type TinaCollection = TinaCloudCollectionBase<false>;
-export declare type TinaField = TinaFieldBase;
-export type { TinaTemplate, TinaCloudTemplateBase };
-export declare const defineSchema: (config: TinaCloudSchema) => TinaCloudSchema;
-export declare const defineConfig: (config: Omit<TinaCMSProviderDefaultProps, 'children'>) => Omit<TinaCMSProviderDefaultProps, "children">;
-export declare const defineStaticConfig: (config: TinaCMSConfig<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, undefined>) => TinaCMSConfig<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, undefined>;
+import type { Config, SchemaField, Schema, Collection, Template } from '@tinacms/schema-tools/dist/types';
+export type { Config, Schema, Collection, Template, SchemaField };
+/**
+ * @deprecated use `SchemaField` instead
+ */
+export declare type TinaFieldEnriched = SchemaField;
+/**
+ * @deprecated use `SchemaField` instead
+ */
+export declare type TinaField = SchemaField;
+/**
+ * @deprecated use `Template` instead
+ */
+export declare type TinaTemplate = Template;
+/**
+ * @deprecated use `Template` instead
+ */
+export declare type Templateable = Template;
+/**
+ * @deprecated use `Template` instead
+ */
+export declare type TinaCloudTemplatebase = Template;
+/**
+ * @deprecated use `Collection` instead
+ */
+export declare type TinaCloudCollection = Collection;
+/**
+ * @deprecated use `Collection` instead
+ */
+export declare type TinaCollection = Collection;
+/**
+ * @deprecated use `Schema` instead
+ */
+export declare type TinaSchema = Schema;
+/**
+ * @deprecated use `Schema` instead
+ */
+export declare type TinaCloudSchema = Schema;
+export declare const defineSchema: (config: Schema) => Schema;
+export declare const defineLegacyConfig: (config: Omit<TinaCMSProviderDefaultProps, 'children'>) => Omit<TinaCMSProviderDefaultProps, "children">;
+export declare const defineStaticConfig: (config: Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, undefined>) => Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, undefined>;
+export declare const defineConfig: (config: Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, undefined>) => Config<(cms: TinaCMS) => TinaCMS, formifyCallback, import("./hooks/use-content-creator").DocumentCreatorArgs, undefined>;

package/dist/index.es.js

@@ -3994,6 +3994,13 @@ function useTina({
   variables,
   data
 }) {
+  React.useEffect(() => {
+    console.warn(`
+  "useTina" from 'tinacms/dist/edit-state' is now deprecated
+  * Use "import { useTina } from 'tinacms/dist/react" instead.
+  * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+  `);
+  }, []);
   const {
     setRequest,
     state,
@@ -4125,6 +4132,12 @@ const TinaCMSProvider2 = ({
   ...props
 }) => {
   var _a;
+  React.useEffect(() => {
+    console.warn(`
+    * Tina no longer requires wrapping your site in the TinaProvider
+    * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+    `);
+  }, []);
   if (props == null ? void 0 : props.apiURL) {
     console.warn("The apiURL prop is deprecated. Please see https://tina.io/blog/tina-v-0.68.14 for information on how to upgrade to the new API");
   }
@@ -5275,7 +5288,7 @@ const FilenameInput = (props) => {
   }));
 };
 const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const navigate = useNavigate();
   const [formIsPristine, setFormIsPristine] = useState(true);
   const schema = cms.api.tina.schema;
@@ -5300,10 +5313,11 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
       };
     }
   }
+  const defaultItem = ((_d = template.ui) == null ? void 0 : _d.defaultItem) || (template == null ? void 0 : template.defaultItem);
   const form = useMemo(() => {
     var _a2, _b2;
     return new Form({
-      initialValues: typeof (schemaCollection == null ? void 0 : schemaCollection.defaultItem) === "function" ? schemaCollection.defaultItem() : schemaCollection == null ? void 0 : schemaCollection.defaultItem,
+      initialValues: typeof defaultItem === "function" ? defaultItem() : defaultItem,
       extraSubscribeValues: { active: true, submitting: true, touched: true },
       onChange: (values) => {
         var _a3;
@@ -5359,7 +5373,7 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
   const windowWidth = useWindowWidth();
   const renderNavToggle = windowWidth < navBreakpoint + 1;
   const headerPadding = renderNavToggle ? "px-20" : "px-6";
-  return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, ((_e = (_d = cms == null ? void 0 : cms.api) == null ? void 0 : _d.tina) == null ? void 0 : _e.isLocalMode) && /* @__PURE__ */ React.createElement(LocalWarning, null), /* @__PURE__ */ React.createElement("div", {
+  return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, ((_f = (_e = cms == null ? void 0 : cms.api) == null ? void 0 : _e.tina) == null ? void 0 : _f.isLocalMode) && /* @__PURE__ */ React.createElement(LocalWarning, null), /* @__PURE__ */ React.createElement("div", {
     className: `py-4 border-b border-gray-200 bg-white ${headerPadding}`
   }, /* @__PURE__ */ React.createElement("div", {
     className: "max-w-form mx-auto"
@@ -5709,12 +5723,16 @@ const defineSchema = (config) => {
   validateSchema({ schema: config });
   return config;
 };
-const defineConfig = (config) => {
+const defineLegacyConfig = (config) => {
   validateSchema({ schema: config.schema });
   return config;
 };
 const defineStaticConfig = (config) => {
+  if (!config.schema) {
+    throw new Error("Static config must have a schema");
+  }
   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 };
+const defineConfig = defineStaticConfig;
+export { AuthWallInner, Client, DEFAULT_LOCAL_TINA_GQL_SERVER_URL, LocalClient, RouteMappingPlugin, TinaAdmin, TinaAdminApi, TinaCMSProvider2, TinaCloudAuthWall, TinaCloudProvider, TinaDataProvider, assertShape, createClient, TinaCMSProvider2 as default, defineConfig, defineLegacyConfig, defineSchema, defineStaticConfig, getStaticPropsForTina, gql, safeAssertShape, staticRequest, useDocumentCreatorPlugin, useGraphqlForms, useTinaAuthRedirect };

package/dist/index.js

@@ -4010,6 +4010,13 @@ mutation addPendingDocumentMutation(
     variables,
     data
   }) {
+    React__default["default"].useEffect(() => {
+      console.warn(`
+  "useTina" from 'tinacms/dist/edit-state' is now deprecated
+  * Use "import { useTina } from 'tinacms/dist/react" instead.
+  * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+  `);
+    }, []);
     const {
       setRequest,
       state,
@@ -4141,6 +4148,12 @@ mutation addPendingDocumentMutation(
     ...props
   }) => {
     var _a;
+    React__default["default"].useEffect(() => {
+      console.warn(`
+    * Tina no longer requires wrapping your site in the TinaProvider
+    * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+    `);
+    }, []);
     if (props == null ? void 0 : props.apiURL) {
       console.warn("The apiURL prop is deprecated. Please see https://tina.io/blog/tina-v-0.68.14 for information on how to upgrade to the new API");
     }
@@ -5291,7 +5304,7 @@ This will work when developing locally but NOT when deployed to production.
     }));
   };
   const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const navigate = reactRouterDom.useNavigate();
     const [formIsPristine, setFormIsPristine] = React.useState(true);
     const schema = cms.api.tina.schema;
@@ -5316,10 +5329,11 @@ This will work when developing locally but NOT when deployed to production.
         };
       }
     }
+    const defaultItem = ((_d = template.ui) == null ? void 0 : _d.defaultItem) || (template == null ? void 0 : template.defaultItem);
     const form = React.useMemo(() => {
       var _a2, _b2;
       return new toolkit.Form({
-        initialValues: typeof (schemaCollection == null ? void 0 : schemaCollection.defaultItem) === "function" ? schemaCollection.defaultItem() : schemaCollection == null ? void 0 : schemaCollection.defaultItem,
+        initialValues: typeof defaultItem === "function" ? defaultItem() : defaultItem,
         extraSubscribeValues: { active: true, submitting: true, touched: true },
         onChange: (values) => {
           var _a3;
@@ -5375,7 +5389,7 @@ This will work when developing locally but NOT when deployed to production.
     const windowWidth = windowSize.useWindowWidth();
     const renderNavToggle = windowWidth < navBreakpoint + 1;
     const headerPadding = renderNavToggle ? "px-20" : "px-6";
-    return /* @__PURE__ */ React__default["default"].createElement(PageWrapper, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, ((_e = (_d = cms == null ? void 0 : cms.api) == null ? void 0 : _d.tina) == null ? void 0 : _e.isLocalMode) && /* @__PURE__ */ React__default["default"].createElement(toolkit.LocalWarning, null), /* @__PURE__ */ React__default["default"].createElement("div", {
+    return /* @__PURE__ */ React__default["default"].createElement(PageWrapper, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, ((_f = (_e = cms == null ? void 0 : cms.api) == null ? void 0 : _e.tina) == null ? void 0 : _f.isLocalMode) && /* @__PURE__ */ React__default["default"].createElement(toolkit.LocalWarning, null), /* @__PURE__ */ React__default["default"].createElement("div", {
       className: `py-4 border-b border-gray-200 bg-white ${headerPadding}`
     }, /* @__PURE__ */ React__default["default"].createElement("div", {
       className: "max-w-form mx-auto"
@@ -5725,14 +5739,18 @@ This will work when developing locally but NOT when deployed to production.
     schemaTools.validateSchema({ schema: config });
     return config;
   };
-  const defineConfig = (config) => {
+  const defineLegacyConfig = (config) => {
     schemaTools.validateSchema({ schema: config.schema });
     return config;
   };
   const defineStaticConfig = (config) => {
+    if (!config.schema) {
+      throw new Error("Static config must have a schema");
+    }
     schemaTools.validateSchema({ schema: config.schema });
     return config;
   };
+  const defineConfig = defineStaticConfig;
   Object.defineProperty(exports2, "MdxFieldPluginExtendible", {
     enumerable: true,
     get: function() {
@@ -5766,6 +5784,7 @@ This will work when developing locally but NOT when deployed to production.
   exports2.createClient = createClient;
   exports2["default"] = TinaCMSProvider2;
   exports2.defineConfig = defineConfig;
+  exports2.defineLegacyConfig = defineLegacyConfig;
   exports2.defineSchema = defineSchema;
   exports2.defineStaticConfig = defineStaticConfig;
   exports2.getStaticPropsForTina = getStaticPropsForTina;

package/dist/react.d.ts

@@ -9,3 +9,6 @@ export declare function useTina<T extends object>(props: {
 }): {
     data: T;
 };
+export declare function useEditState(): {
+    edit: boolean;
+};

package/dist/react.es.js

@@ -16,4 +16,19 @@ function useTina(props) {
   }, [id]);
   return { data };
 }
-export { useTina };
+function useEditState() {
+  const [edit, setEdit] = React.useState(false);
+  React.useEffect(() => {
+    if (typeof window !== "undefined") {
+      parent.postMessage({ type: "isEditMode" }, window.location.origin);
+      window.addEventListener("message", (event) => {
+        var _a;
+        if (((_a = event.data) == null ? void 0 : _a.type) === "tina:editMode") {
+          setEdit(true);
+        }
+      });
+    }
+  }, []);
+  return { edit };
+}
+export { useEditState, useTina };

package/dist/react.js

@@ -23,6 +23,22 @@
     }, [id]);
     return { data };
   }
+  function useEditState() {
+    const [edit, setEdit] = React__default["default"].useState(false);
+    React__default["default"].useEffect(() => {
+      if (typeof window !== "undefined") {
+        parent.postMessage({ type: "isEditMode" }, window.location.origin);
+        window.addEventListener("message", (event) => {
+          var _a;
+          if (((_a = event.data) == null ? void 0 : _a.type) === "tina:editMode") {
+            setEdit(true);
+          }
+        });
+      }
+    }, []);
+    return { edit };
+  }
+  exports2.useEditState = useEditState;
   exports2.useTina = useTina;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });

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

@@ -57,6 +57,9 @@ declare type BaseComponents = {
     ol?: {
         children: JSX.Element;
     };
+    li?: {
+        children: JSX.Element;
+    };
     block_quote?: {
         children: JSX.Element;
     };
@@ -121,8 +124,10 @@ export declare type TinaMarkdownContent = {
     type: string;
     children: TinaMarkdownContent[];
 };
-export declare const TinaMarkdown: ({ content, components, }: {
+export declare const TinaMarkdown: <CustomComponents extends {
+    [key: string]: object;
+} = any>({ content, components, }: {
     content: TinaMarkdownContent | TinaMarkdownContent[];
-    components?: Components<{}>;
+    components?: Components<{}> | Components<{ [BK in keyof CustomComponents]: (props: CustomComponents[BK]) => JSX.Element; }>;
 }) => JSX.Element;
 export {};

package/dist/tina-cms.d.ts

@@ -13,6 +13,11 @@ limitations under the License.
 import type { formifyCallback } from './hooks/use-graphql-forms';
 import { useDocumentCreatorPlugin } from './hooks/use-content-creator';
 import { TinaCMSProviderDefaultProps } from './types/cms';
+/**
+ * @deprecated since version 1.0.
+ * Tina no longer requires wrapping your site in the TinaProvider
+ * See https://tina.io/blog/upgrading-to-iframe/ for full migration details
+ */
 export declare const TinaCMSProvider2: ({ query, documentCreatorCallback, formifyCallback, schema, ...props }: TinaCMSProviderDefaultProps) => JSX.Element;
 export declare type DocumentCreatorCallback = Parameters<typeof useDocumentCreatorPlugin>[0];
 export declare const TinaDataProvider: ({ children, formifyCallback, }: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.69.22",
+  "version": "0.70.1",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -55,10 +55,11 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "0.1.9",
+    "@tinacms/schema-tools": "0.2.1",
     "@tinacms/sharedctx": "0.1.3",
-    "@tinacms/toolkit": "0.58.4",
+    "@tinacms/toolkit": "0.58.5",
     "crypto-js": "^4.0.0",
+    "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",
     "graphql": "15.8.0",