tinacms 0.68.1 → 0.68.4

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # tinacms
 
+## 0.68.4
+
+### Patch Changes
+
+- 7372f90ca: Adds a new client that can be used on the backend and frontend.
+- Updated dependencies [d4f98d0fc]
+- Updated dependencies [7e2272442]
+  - @tinacms/toolkit@0.56.27
+
+## 0.68.3
+
+### Patch Changes
+
+- 8b7ee346a: - Display label instead of name for mdx dropdown af306fa
+  - Fix issue where reset triggered chagnes to the wrong rich-text field 03f6191
+  - Fix issue where null children in a code block threw an error e454bce
+- Updated dependencies [f6f56bcc0]
+- Updated dependencies [59d33a74a]
+- Updated dependencies [8b7ee346a]
+- Updated dependencies [acb38bf9f]
+  - @tinacms/toolkit@0.56.26
+
+## 0.68.2
+
+### Patch Changes
+
+- Updated dependencies [e90647da3]
+  - @tinacms/toolkit@0.56.25
+
 ## 0.68.1
 
 ### Patch Changes

package/dist/auth/TinaCloudProvider.d.ts

@@ -12,7 +12,7 @@ limitations under the License.
 */
 import React from 'react';
 import { TinaCMS, MediaStore } from '@tinacms/toolkit';
-import { Client, TinaIOConfig } from '../client';
+import { Client, TinaIOConfig } from '../internalClient';
 import { CreateClientProps } from '../utils';
 export interface TinaCloudMediaStoreClass {
     new (client: Client): MediaStore;

package/dist/client.d.ts

@@ -0,0 +1,13 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+export * from './unifiedClient';

package/dist/client.es.js

@@ -0,0 +1,40 @@
+import fetchPonyfill from "fetch-ponyfill";
+const { fetch, Headers } = fetchPonyfill();
+class TinaClient {
+  constructor({ token, url }) {
+    this.apiUrl = url;
+    this.readonlyToken = token;
+  }
+  async request(args) {
+    const headers = new Headers();
+    if (this.readonlyToken) {
+      headers.append("X-API-KEY", this.readonlyToken);
+    }
+    headers.append("Content-Type", "application/json");
+    const bodyString = JSON.stringify({
+      query: args.query,
+      variables: (args == null ? void 0 : args.variables) || {}
+    });
+    const url = (args == null ? void 0 : args.url) || this.apiUrl;
+    const res = await fetch(url, {
+      method: "POST",
+      headers,
+      body: bodyString,
+      redirect: "follow"
+    });
+    const json = await res.json();
+    if (json.errors) {
+      throw new Error(`Unable to fetch, errors: 
+	${json.errors.map((error) => error.message).join("\n")}`);
+    }
+    return {
+      data: json == null ? void 0 : json.data,
+      query: args.query
+    };
+  }
+}
+const createClient = (args) => {
+  const client = new TinaClient(args);
+  return client;
+};
+export { TinaClient, createClient };

package/dist/client.js

@@ -0,0 +1,51 @@
+(function(global, factory) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("fetch-ponyfill")) : typeof define === "function" && define.amd ? define(["exports", "fetch-ponyfill"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.tinacms = {}, global.NOOP));
+})(this, function(exports2, fetchPonyfill) {
+  "use strict";
+  function _interopDefaultLegacy(e) {
+    return e && typeof e === "object" && "default" in e ? e : { "default": e };
+  }
+  var fetchPonyfill__default = /* @__PURE__ */ _interopDefaultLegacy(fetchPonyfill);
+  const { fetch, Headers } = fetchPonyfill__default["default"]();
+  class TinaClient {
+    constructor({ token, url }) {
+      this.apiUrl = url;
+      this.readonlyToken = token;
+    }
+    async request(args) {
+      const headers = new Headers();
+      if (this.readonlyToken) {
+        headers.append("X-API-KEY", this.readonlyToken);
+      }
+      headers.append("Content-Type", "application/json");
+      const bodyString = JSON.stringify({
+        query: args.query,
+        variables: (args == null ? void 0 : args.variables) || {}
+      });
+      const url = (args == null ? void 0 : args.url) || this.apiUrl;
+      const res = await fetch(url, {
+        method: "POST",
+        headers,
+        body: bodyString,
+        redirect: "follow"
+      });
+      const json = await res.json();
+      if (json.errors) {
+        throw new Error(`Unable to fetch, errors: 
+	${json.errors.map((error) => error.message).join("\n")}`);
+      }
+      return {
+        data: json == null ? void 0 : json.data,
+        query: args.query
+      };
+    }
+  }
+  const createClient = (args) => {
+    const client = new TinaClient(args);
+    return client;
+  };
+  exports2.TinaClient = TinaClient;
+  exports2.createClient = createClient;
+  Object.defineProperty(exports2, "__esModule", { value: true });
+  exports2[Symbol.toStringTag] = "Module";
+});

package/dist/index.d.ts

@@ -10,7 +10,7 @@ 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.
 */
-export * from './client';
+export * from './internalClient';
 export * from './auth';
 export * from './utils';
 export * from './tina-cms';

package/dist/index.es.js

@@ -1605,16 +1605,11 @@ function reducer(state, action) {
         const blueprint = getFormNodeBlueprint(formNode, state);
         if (blueprint.hasValuesField) {
           changeSets.push(__spreadValues({
-            path: [formNodePath(formNode), "values"].join(".")
-          }, buildChangeSet(event, formNode)));
-        }
-        if (blueprint.hasDataJSONField) {
-          changeSets.push(__spreadValues({
-            path: [formNodePath(formNode), "dataJSON"].join(".")
+            path: [formNodePath(formNode), "_values"].join(".")
           }, buildChangeSet(event, formNode)));
         }
         changeSets.push(__spreadValues({
-          path: [formNodePath(formNode), "data"].join(".")
+          path: [formNodePath(formNode)].join(".")
         }, buildChangeSet(event, formNode)));
       });
       return __spreadProps(__spreadValues({}, state), { changeSets });
@@ -2985,11 +2980,13 @@ const TinaCMSProvider2 = (_c) => {
     "formifyCallback",
     "schema"
   ]);
+  var _a;
   const validOldSetup = new Boolean(props == null ? void 0 : props.isLocalClient) || new Boolean(props == null ? void 0 : props.clientId) && new Boolean(props == null ? void 0 : props.branch);
-  if (!props.apiURL && !validOldSetup) {
-    throw new Error(`apiURL is a required field`);
+  const apiURL = ((_a = props == null ? void 0 : props.client) == null ? void 0 : _a.apiUrl) || (props == null ? void 0 : props.apiURL);
+  if (!apiURL && !validOldSetup) {
+    throw new Error(`Must provide apiUrl or a client to the TinaWrapper component`);
   }
-  const { branch, clientId, isLocalClient } = props.apiURL ? parseURL(props.apiURL) : {
+  const { branch, clientId, isLocalClient } = apiURL ? parseURL(apiURL) : {
     branch: props.branch,
     clientId: props.clientId,
     isLocalClient: props.isLocalClient

package/dist/index.js

@@ -1624,16 +1624,11 @@ var __objRest = (source, exclude) => {
           const blueprint = getFormNodeBlueprint(formNode, state);
           if (blueprint.hasValuesField) {
             changeSets.push(__spreadValues({
-              path: [formNodePath(formNode), "values"].join(".")
-            }, buildChangeSet(event, formNode)));
-          }
-          if (blueprint.hasDataJSONField) {
-            changeSets.push(__spreadValues({
-              path: [formNodePath(formNode), "dataJSON"].join(".")
+              path: [formNodePath(formNode), "_values"].join(".")
             }, buildChangeSet(event, formNode)));
           }
           changeSets.push(__spreadValues({
-            path: [formNodePath(formNode), "data"].join(".")
+            path: [formNodePath(formNode)].join(".")
           }, buildChangeSet(event, formNode)));
         });
         return __spreadProps(__spreadValues({}, state), { changeSets });
@@ -3004,11 +2999,13 @@ mutation addPendingDocumentMutation(
       "formifyCallback",
       "schema"
     ]);
+    var _a;
     const validOldSetup = new Boolean(props == null ? void 0 : props.isLocalClient) || new Boolean(props == null ? void 0 : props.clientId) && new Boolean(props == null ? void 0 : props.branch);
-    if (!props.apiURL && !validOldSetup) {
-      throw new Error(`apiURL is a required field`);
+    const apiURL = ((_a = props == null ? void 0 : props.client) == null ? void 0 : _a.apiUrl) || (props == null ? void 0 : props.apiURL);
+    if (!apiURL && !validOldSetup) {
+      throw new Error(`Must provide apiUrl or a client to the TinaWrapper component`);
     }
-    const { branch, clientId, isLocalClient } = props.apiURL ? parseURL(props.apiURL) : {
+    const { branch, clientId, isLocalClient } = apiURL ? parseURL(apiURL) : {
       branch: props.branch,
       clientId: props.clientId,
       isLocalClient: props.isLocalClient

package/dist/rich-text.es.js

@@ -108,7 +108,7 @@ const TinaMarkdown = ({
       case "code_block":
         const value = child.children.map((item) => {
           var _a2;
-          return ((_a2 = item.children[0]) == null ? void 0 : _a2.text) || "";
+          return item.children ? ((_a2 = item.children[0]) == null ? void 0 : _a2.text) || "" : "";
         }).join("\n");
         if (components[child.type]) {
           const Component2 = components[child.type];

package/dist/rich-text.js

@@ -115,7 +115,7 @@ var __objRest = (source, exclude) => {
         case "code_block":
           const value = child.children.map((item) => {
             var _a2;
-            return ((_a2 = item.children[0]) == null ? void 0 : _a2.text) || "";
+            return item.children ? ((_a2 = item.children[0]) == null ? void 0 : _a2.text) || "" : "";
           }).join("\n");
           if (components[child.type]) {
             const Component2 = components[child.type];

package/dist/tina-cms.d.ts

@@ -11,13 +11,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import type { TinaClient } from './client';
 import { TinaCloudMediaStoreClass } from './auth';
 import type { TinaCMS } from '@tinacms/toolkit';
 import type { TinaCloudSchema } from '@tinacms/schema-tools';
-import type { TinaIOConfig } from './client/index';
+import type { TinaIOConfig } from './internalClient/index';
 import type { formifyCallback } from './hooks/use-graphql-forms';
 import { useDocumentCreatorPlugin } from './hooks/use-content-creator';
 declare type APIProviderProps = {
+    /**
+     * The API url From this client will be used to make requests.
+     *
+     */
+    client?: never;
     /**
      * Content API URL
      *
@@ -42,6 +48,36 @@ declare type APIProviderProps = {
      * @deprecated use apiURL instead
      */
     clientId?: never;
+} | {
+    /**
+     * The API url From this client will be used to make requests.
+     *
+     */
+    client: TinaClient;
+    /**
+     * Content API URL
+     *
+     */
+    apiURL?: never;
+    /**
+     * Point to the local version of GraphQL instead of tina.io
+     * https://tina.io/docs/tinacms-context/#adding-tina-to-the-sites-frontend
+     *
+     * @deprecated use apiURL instead
+     */
+    isLocalClient?: never;
+    /**
+     * The base branch to pull content from. Note that this is ignored for local development
+     *
+     * @deprecated use apiURL instead
+     */
+    branch?: never;
+    /**
+     * Your clientID from tina.aio
+     *
+     * @deprecated use apiURL instead
+     */
+    clientId?: never;
 } | {
     /**
      * Content API URL
@@ -67,6 +103,11 @@ declare type APIProviderProps = {
      * @deprecated use apiURL instead
      */
     clientId?: string;
+    /**
+     * The API url From this client will be used to make requests.
+     *
+     */
+    client: never;
 };
 interface BaseProviderProps {
     /** Callback if you need access to the TinaCMS instance */

package/dist/unifiedClient/index.d.ts

@@ -0,0 +1,30 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+export interface TinaClientArs {
+    url: string;
+    token?: string;
+}
+export declare type TinaClientRequestArgs = {
+    variables?: Record<string, any>;
+    query: string;
+} & Partial<TinaClientArs>;
+export declare class TinaClient {
+    apiUrl: string;
+    readonlyToken?: string;
+    constructor({ token, url }: TinaClientArs);
+    request<DataType extends Record<string, any> = any>(args: TinaClientRequestArgs): Promise<{
+        data: DataType;
+        query: string;
+    }>;
+}
+export declare const createClient: (args: TinaClientArs) => TinaClient;

package/dist/utils/index.d.ts

@@ -10,8 +10,8 @@ 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 { Client } from '../client';
-import type { TinaIOConfig } from '../client';
+import { Client } from '../internalClient';
+import type { TinaIOConfig } from '../internalClient';
 import * as yup from 'yup';
 import { TinaCloudSchema } from '@tinacms/schema-tools';
 export interface CreateClientProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.68.1",
+  "version": "0.68.4",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -9,7 +9,8 @@
     "entryPoints": [
       "src/index.ts",
       "src/edit-state.tsx",
-      "src/rich-text.tsx"
+      "src/rich-text.tsx",
+      "src/client.ts"
     ]
   },
   "typings": "dist/index.d.ts",
@@ -26,8 +27,9 @@
     "@heroicons/react": "^1.0.4",
     "@tinacms/schema-tools": "0.0.3",
     "@tinacms/sharedctx": "0.1.1",
-    "@tinacms/toolkit": "0.56.24",
+    "@tinacms/toolkit": "0.56.27",
     "crypto-js": "^4.0.0",
+    "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",
     "graphql": "^15.1.0",
     "graphql-tag": "^2.11.0",