tinacms 1.3.3 → 1.4.0

package/dist/admin/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
-export declare const TinaAdmin: ({ preview, config, schemaJson, }: {
+export declare const TinaAdmin: ({ preview, Playground, config, schemaJson, }: {
     schemaJson?: any;
     preview?: (props: object) => JSX.Element;
+    Playground?: (props: object) => JSX.Element;
     config: object;
 }) => JSX.Element;

package/dist/admin/pages/CollectionCreatePage.d.ts

@@ -1,6 +1,3 @@
-/**
-
-*/
 /// <reference types="react" />
 declare const CollectionCreatePage: () => JSX.Element;
 export default CollectionCreatePage;

package/dist/index.es.js

@@ -4,7 +4,7 @@ export * from "@tinacms/toolkit";
 export { MdxFieldPluginExtendible } from "@tinacms/toolkit";
 import { getIntrospectionQuery, buildClientSchema, print, parse, buildSchema } from "graphql";
 import gql$1 from "graphql-tag";
-import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, validateSchema } from "@tinacms/schema-tools";
+import { TinaSchema, addNamespaceToSchema, parseURL, resolveForm, normalizePath, validateSchema } from "@tinacms/schema-tools";
 export { NAMER, resolveForm } from "@tinacms/schema-tools";
 import React, { useState, useCallback, useEffect, Fragment, useMemo } from "react";
 import * as yup from "yup";
@@ -126,6 +126,7 @@ mutation addPendingDocumentMutation(
       });
       return parse(data.getOptimizedQuery);
     };
+    this.tinaGraphQLVersion = options.tinaGraphQLVersion;
     this.onLogin = (_d = (_c = (_b = (_a = options.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.admin) == null ? void 0 : _c.auth) == null ? void 0 : _d.onLogin;
     this.onLogout = (_h = (_g = (_f = (_e = options.schema) == null ? void 0 : _e.config) == null ? void 0 : _f.admin) == null ? void 0 : _g.auth) == null ? void 0 : _h.onLogout;
     if ((_l = (_k = (_j = (_i = options.schema) == null ? void 0 : _i.config) == null ? void 0 : _j.admin) == null ? void 0 : _k.auth) == null ? void 0 : _l.logout) {
@@ -210,7 +211,7 @@ mutation addPendingDocumentMutation(
     this.frontendUrl = ((_b = this.options.tinaioConfig) == null ? void 0 : _b.frontendUrlOverride) || "https://app.tina.io";
     this.identityApiUrl = ((_c = this.options.tinaioConfig) == null ? void 0 : _c.identityApiUrlOverride) || "https://identity.tinajs.io";
     this.contentApiBase = ((_d = this.options.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://content.tinajs.io`;
-    this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/content/${this.options.clientId}/github/${encodedBranch}`;
+    this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/${this.tinaGraphQLVersion}/content/${this.options.clientId}/github/${encodedBranch}`;
   }
   async request(query, { variables }) {
     const res = await fetch(this.contentApiUrl, {
@@ -462,6 +463,7 @@ class LocalClient extends Client {
       ...props,
       clientId: "",
       branch: "",
+      tinaGraphQLVersion: "",
       customContentApiUrl: props && props.customContentApiUrl ? props.customContentApiUrl : DEFAULT_LOCAL_TINA_GQL_SERVER_URL
     };
     super(clientProps);
@@ -533,14 +535,16 @@ const createClient = ({
   branch,
   tinaioConfig,
   schema,
-  apiUrl
+  apiUrl,
+  tinaGraphQLVersion
 }) => {
   return isLocalClient ? new LocalClient({ customContentApiUrl: apiUrl, schema }) : new Client({
     clientId: clientId || "",
     branch: branch || "main",
     tokenStorage: "LOCAL_STORAGE",
     tinaioConfig,
-    schema
+    schema,
+    tinaGraphQLVersion
   });
 };
 function assertShape(value, yupSchema, errorMessage) {
@@ -2302,7 +2306,8 @@ const TinaCMSProvider2 = ({
     cmsCallback: props.cmsCallback,
     mediaStore: props.mediaStore,
     apiUrl: apiURL,
-    schema: { ...schema, config: { ...schema.config, ...props } }
+    schema: { ...schema, config: { ...schema.config, ...props } },
+    tinaGraphQLVersion: props.tinaGraphQLVersion
   }, /* @__PURE__ */ React.createElement("style", null, styles), /* @__PURE__ */ React.createElement(ErrorBoundary, null, props.children)));
 };
 const Loader = (props) => {
@@ -3765,6 +3770,7 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
           description: /* @__PURE__ */ React.createElement("span", null, "A unique filename for the content.", /* @__PURE__ */ React.createElement("br", null), "Examples: ", /* @__PURE__ */ React.createElement("code", null, "My_Document"), ", ", /* @__PURE__ */ React.createElement("code", null, "My_Document.en"), ",", " ", /* @__PURE__ */ React.createElement("code", null, "sub-folder/My_Document")),
           placeholder: `My_Document`,
           validate: (value, allValues, meta) => {
+            var _a3, _b3;
             if (!value) {
               if (meta.dirty) {
                 return "Required";
@@ -3775,6 +3781,16 @@ const RenderForm$1 = ({ cms, collection, templateName, mutationInfo }) => {
             if (value && !isValid) {
               return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
             }
+            if (((_a3 = schemaCollection.match) == null ? void 0 : _a3.exclude) || ((_b3 = schemaCollection.match) == null ? void 0 : _b3.include)) {
+              const filePath = `${normalizePath(schemaCollection.path)}/${value}.${schemaCollection.format || "md"}`;
+              const match = schema.matchFiles({
+                files: [filePath],
+                collection: schemaCollection
+              });
+              if (match.length === 0) {
+                return `The filename "${value}" is not allowed for this collection.`;
+              }
+            }
           }
         }
       ],
@@ -4081,6 +4097,7 @@ const CheckSchema = ({
 };
 const TinaAdmin = ({
   preview,
+  Playground,
   config,
   schemaJson
 }) => {
@@ -4113,6 +4130,9 @@ const TinaAdmin = ({
           config,
           preview
         })
+      }), /* @__PURE__ */ React.createElement(Route, {
+        path: "graphql",
+        element: /* @__PURE__ */ React.createElement(PlainLayout, null, /* @__PURE__ */ React.createElement(Playground, null))
       }), /* @__PURE__ */ React.createElement(Route, {
         path: "collections/:collectionName/new",
         element: /* @__PURE__ */ React.createElement(DefaultWrapper, {
@@ -4174,6 +4194,21 @@ const DefaultWrapper = ({
     className: "flex-1 relative"
   }, children)));
 };
+const PlainLayout = ({ children }) => {
+  return /* @__PURE__ */ React.createElement("div", {
+    style: {
+      position: "fixed",
+      top: 0,
+      left: 0,
+      width: "100%",
+      height: "100%",
+      overflow: "auto",
+      background: "#F6F6F9",
+      fontFamily: "'Inter', sans-serif",
+      zIndex: 9999
+    }
+  }, children);
+};
 class RouteMappingPlugin {
   constructor(mapper) {
     this.__type = "tina-admin";

package/dist/index.js

@@ -141,6 +141,7 @@ mutation addPendingDocumentMutation(
         });
         return graphql.parse(data.getOptimizedQuery);
       };
+      this.tinaGraphQLVersion = options.tinaGraphQLVersion;
       this.onLogin = (_d = (_c = (_b = (_a = options.schema) == null ? void 0 : _a.config) == null ? void 0 : _b.admin) == null ? void 0 : _c.auth) == null ? void 0 : _d.onLogin;
       this.onLogout = (_h = (_g = (_f = (_e = options.schema) == null ? void 0 : _e.config) == null ? void 0 : _f.admin) == null ? void 0 : _g.auth) == null ? void 0 : _h.onLogout;
       if ((_l = (_k = (_j = (_i = options.schema) == null ? void 0 : _i.config) == null ? void 0 : _j.admin) == null ? void 0 : _k.auth) == null ? void 0 : _l.logout) {
@@ -225,7 +226,7 @@ mutation addPendingDocumentMutation(
       this.frontendUrl = ((_b = this.options.tinaioConfig) == null ? void 0 : _b.frontendUrlOverride) || "https://app.tina.io";
       this.identityApiUrl = ((_c = this.options.tinaioConfig) == null ? void 0 : _c.identityApiUrlOverride) || "https://identity.tinajs.io";
       this.contentApiBase = ((_d = this.options.tinaioConfig) == null ? void 0 : _d.contentApiUrlOverride) || `https://content.tinajs.io`;
-      this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/content/${this.options.clientId}/github/${encodedBranch}`;
+      this.contentApiUrl = this.options.customContentApiUrl || `${this.contentApiBase}/${this.tinaGraphQLVersion}/content/${this.options.clientId}/github/${encodedBranch}`;
     }
     async request(query, { variables }) {
       const res = await fetch(this.contentApiUrl, {
@@ -477,6 +478,7 @@ mutation addPendingDocumentMutation(
         ...props,
         clientId: "",
         branch: "",
+        tinaGraphQLVersion: "",
         customContentApiUrl: props && props.customContentApiUrl ? props.customContentApiUrl : DEFAULT_LOCAL_TINA_GQL_SERVER_URL
       };
       super(clientProps);
@@ -548,14 +550,16 @@ mutation addPendingDocumentMutation(
     branch,
     tinaioConfig,
     schema,
-    apiUrl
+    apiUrl,
+    tinaGraphQLVersion
   }) => {
     return isLocalClient ? new LocalClient({ customContentApiUrl: apiUrl, schema }) : new Client({
       clientId: clientId || "",
       branch: branch || "main",
       tokenStorage: "LOCAL_STORAGE",
       tinaioConfig,
-      schema
+      schema,
+      tinaGraphQLVersion
     });
   };
   function assertShape(value, yupSchema, errorMessage) {
@@ -2317,7 +2321,8 @@ mutation addPendingDocumentMutation(
       cmsCallback: props.cmsCallback,
       mediaStore: props.mediaStore,
       apiUrl: apiURL,
-      schema: { ...schema, config: { ...schema.config, ...props } }
+      schema: { ...schema, config: { ...schema.config, ...props } },
+      tinaGraphQLVersion: props.tinaGraphQLVersion
     }, /* @__PURE__ */ React__default["default"].createElement("style", null, styles), /* @__PURE__ */ React__default["default"].createElement(ErrorBoundary, null, props.children)));
   };
   const Loader = (props) => {
@@ -3780,6 +3785,7 @@ This will work when developing locally but NOT when deployed to production.
             description: /* @__PURE__ */ React__default["default"].createElement("span", null, "A unique filename for the content.", /* @__PURE__ */ React__default["default"].createElement("br", null), "Examples: ", /* @__PURE__ */ React__default["default"].createElement("code", null, "My_Document"), ", ", /* @__PURE__ */ React__default["default"].createElement("code", null, "My_Document.en"), ",", " ", /* @__PURE__ */ React__default["default"].createElement("code", null, "sub-folder/My_Document")),
             placeholder: `My_Document`,
             validate: (value, allValues, meta) => {
+              var _a3, _b3;
               if (!value) {
                 if (meta.dirty) {
                   return "Required";
@@ -3790,6 +3796,16 @@ This will work when developing locally but NOT when deployed to production.
               if (value && !isValid) {
                 return "Must begin with a-z, A-Z, 0-9, or _ and contain only a-z, A-Z, 0-9, -, _, ., or /.";
               }
+              if (((_a3 = schemaCollection.match) == null ? void 0 : _a3.exclude) || ((_b3 = schemaCollection.match) == null ? void 0 : _b3.include)) {
+                const filePath = `${schemaTools.normalizePath(schemaCollection.path)}/${value}.${schemaCollection.format || "md"}`;
+                const match = schema.matchFiles({
+                  files: [filePath],
+                  collection: schemaCollection
+                });
+                if (match.length === 0) {
+                  return `The filename "${value}" is not allowed for this collection.`;
+                }
+              }
             }
           }
         ],
@@ -4096,6 +4112,7 @@ This will work when developing locally but NOT when deployed to production.
   };
   const TinaAdmin = ({
     preview,
+    Playground,
     config,
     schemaJson
   }) => {
@@ -4128,6 +4145,9 @@ This will work when developing locally but NOT when deployed to production.
             config,
             preview
           })
+        }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
+          path: "graphql",
+          element: /* @__PURE__ */ React__default["default"].createElement(PlainLayout, null, /* @__PURE__ */ React__default["default"].createElement(Playground, null))
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
           path: "collections/:collectionName/new",
           element: /* @__PURE__ */ React__default["default"].createElement(DefaultWrapper, {
@@ -4189,6 +4209,21 @@ This will work when developing locally but NOT when deployed to production.
       className: "flex-1 relative"
     }, children)));
   };
+  const PlainLayout = ({ children }) => {
+    return /* @__PURE__ */ React__default["default"].createElement("div", {
+      style: {
+        position: "fixed",
+        top: 0,
+        left: 0,
+        width: "100%",
+        height: "100%",
+        overflow: "auto",
+        background: "#F6F6F9",
+        fontFamily: "'Inter', sans-serif",
+        zIndex: 9999
+      }
+    }, children);
+  };
   class RouteMappingPlugin {
     constructor(mapper) {
       this.__type = "tina-admin";

package/dist/internalClient/index.d.ts

@@ -16,6 +16,7 @@ interface ServerOptions {
     schema?: Schema;
     clientId: string;
     branch: string;
+    tinaGraphQLVersion: string;
     customContentApiUrl?: string;
     getTokenFn?: () => Promise<TokenObject>;
     tinaioConfig?: TinaIOConfig;
@@ -117,6 +118,7 @@ export declare class Client {
     clientId: string;
     contentApiBase: string;
     query: string;
+    tinaGraphQLVersion: string;
     setToken: (_token: TokenObject) => void;
     private getToken;
     private token;
@@ -226,7 +228,7 @@ export declare class LocalClient extends Client {
     constructor(props?: {
         customContentApiUrl?: string;
         schema?: Schema;
-    } & Omit<ServerOptions, 'clientId' | 'branch'>);
+    } & Omit<ServerOptions, 'clientId' | 'branch' | 'tinaGraphQLVersion'>);
     get isLocalMode(): boolean;
     logout(): Promise<void>;
     authenticate(): Promise<{

package/dist/types/cms.d.ts

@@ -51,5 +51,7 @@ declare type QueryProviderProps = {
     /** The `data` from getStaticProps */
     data?: never;
 };
-export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & Config;
+export declare type TinaCMSProviderDefaultProps = QueryProviderProps & APIProviderProps & BaseProviderProps & Config & {
+    tinaGraphQLVersion: string;
+};
 export {};

package/dist/utils/index.d.ts

@@ -14,7 +14,8 @@ export interface CreateClientProps {
     branch?: string;
     schema?: Schema;
     apiUrl?: string;
+    tinaGraphQLVersion: string;
 }
-export declare const createClient: ({ clientId, isLocalClient, branch, tinaioConfig, schema, apiUrl, }: CreateClientProps) => Client;
+export declare const createClient: ({ clientId, isLocalClient, branch, tinaioConfig, schema, apiUrl, tinaGraphQLVersion, }: CreateClientProps) => Client;
 export declare function assertShape<T extends unknown>(value: unknown, yupSchema: (args: typeof yup) => yup.AnySchema, errorMessage?: string): asserts value is T;
 export declare function safeAssertShape<T extends unknown>(value: unknown, yupSchema: (args: typeof yup) => yup.AnySchema): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -56,9 +56,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "1.3.4",
+    "@tinacms/schema-tools": "1.4.0",
     "@tinacms/sharedctx": "1.0.1",
-    "@tinacms/toolkit": "1.5.2",
+    "@tinacms/toolkit": "1.6.0",
     "crypto-js": "^4.0.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",
@@ -78,7 +78,7 @@
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@testing-library/user-event": "^12.7.0",
-    "@tinacms/scripts": "1.0.4",
+    "@tinacms/scripts": "1.1.0",
     "@types/jest": "^27.0.1",
     "@types/lodash": "^4.14.169",
     "@types/node": "^14.0.13",