tinacms 0.68.13 → 0.68.14

package/dist/client.es.js

@@ -36,9 +36,7 @@ class TinaClient {
     };
     this.apiUrl = url;
     this.readonlyToken = token;
-    if (queries) {
-      this.queries = queries(this);
-    }
+    this.queries = queries(this);
   }
   async request(args) {
     const headers = new Headers();
@@ -57,9 +55,18 @@ class TinaClient {
       body: bodyString,
       redirect: "follow"
     });
+    if (!res.ok) {
+      let additionalInfo = "";
+      if (res.status === 401) {
+        additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+      }
+      throw new Error(`Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`);
+    }
     const json = await res.json();
     if (json.errors) {
-      throw new Error(`Unable to fetch, errors: 
+      throw new Error(`Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+  
+        Errors: 
 	${json.errors.map((error) => error.message).join("\n")}`);
     }
     return {

package/dist/client.js

@@ -43,9 +43,7 @@
       };
       this.apiUrl = url;
       this.readonlyToken = token;
-      if (queries) {
-        this.queries = queries(this);
-      }
+      this.queries = queries(this);
     }
     async request(args) {
       const headers = new Headers();
@@ -64,9 +62,18 @@
         body: bodyString,
         redirect: "follow"
       });
+      if (!res.ok) {
+        let additionalInfo = "";
+        if (res.status === 401) {
+          additionalInfo = "Please check that your client ID, URL and read only token are configured properly.";
+        }
+        throw new Error(`Server responded with status code ${res.status}, ${res.statusText}. ${additionalInfo ? additionalInfo : ""} Please see our FAQ for more information: https://tina.io/docs/errors/faq/`);
+      }
       const json = await res.json();
       if (json.errors) {
-        throw new Error(`Unable to fetch, errors: 
+        throw new Error(`Unable to fetch, please see our FAQ for more information: https://tina.io/docs/errors/faq/
+  
+        Errors: 
 	${json.errors.map((error) => error.message).join("\n")}`);
       }
       return {

package/dist/index.es.js

@@ -2459,7 +2459,6 @@ class TinaAdminApi {
   constructor(cms) {
     this.api = cms.api.tina;
     this.schema = cms.api.tina.schema;
-    this.useDataLayer = cms.flags.get("experimentalData");
   }
   async isAuthenticated() {
     return await this.api.isAuthenticated();
@@ -2486,9 +2485,8 @@ class TinaAdminApi {
   }
   async fetchCollection(collectionName, includeDocuments, after) {
     if (includeDocuments === true) {
-      if (this.useDataLayer) {
-        const sort = this.schema.getIsTitleFieldName(collectionName);
-        const response = await this.api.request(`#graphql
+      const sort = this.schema.getIsTitleFieldName(collectionName);
+      const response = await this.api.request(`#graphql
       query($collection: String!, $includeDocuments: Boolean!, $sort: String,  $limit: Float, $after: String){
         collection(collection: $collection){
           name
@@ -2522,45 +2520,15 @@ class TinaAdminApi {
           }
         }
       }`, {
-          variables: {
-            collection: collectionName,
-            includeDocuments,
-            sort,
-            limit: 10,
-            after
-          }
-        });
-        return response.collection;
-      } else {
-        const response = await this.api.request(`#graphql
-    query($collection: String!, $includeDocuments: Boolean!){
-      collection(collection: $collection){
-        name
-        label
-        format
-        templates
-        documents @include(if: $includeDocuments) {
-          totalCount
-          edges {
-            node {
-              ... on Document {
-                _sys {
-                  template
-                  breadcrumbs
-                  path
-                  basename
-                  relativePath
-                  filename
-                  extension
-                }
-              }
-            }
-          }
+        variables: {
+          collection: collectionName,
+          includeDocuments,
+          sort,
+          limit: 10,
+          after
         }
-      }
-    }`, { variables: { collection: collectionName, includeDocuments } });
-        return response.collection;
-      }
+      });
+      return response.collection;
     } else {
       try {
         const collection = this.schema.getCollection(collectionName);
@@ -4825,7 +4793,6 @@ const CollectionListPage = () => {
       const documents = collection.documents.edges;
       const admin = cms.api.admin;
       const pageInfo = collection.documents.pageInfo;
-      const useDataFlag = cms.flags.get("experimentalData");
       return /* @__PURE__ */ React.createElement(PageWrapper, null, /* @__PURE__ */ React.createElement(React.Fragment, null, open && /* @__PURE__ */ React.createElement(DeleteModal, {
         filename: vars.relativePath,
         deleteFunc: async () => {
@@ -4928,7 +4895,7 @@ const CollectionListPage = () => {
             }
           ]
         })));
-      }))), useDataFlag && /* @__PURE__ */ React.createElement("div", {
+      }))), /* @__PURE__ */ React.createElement("div", {
         className: "pt-3"
       }, /* @__PURE__ */ React.createElement(CursorPaginator, {
         variant: "white",

package/dist/index.js

@@ -2477,7 +2477,6 @@ mutation addPendingDocumentMutation(
     constructor(cms) {
       this.api = cms.api.tina;
       this.schema = cms.api.tina.schema;
-      this.useDataLayer = cms.flags.get("experimentalData");
     }
     async isAuthenticated() {
       return await this.api.isAuthenticated();
@@ -2504,9 +2503,8 @@ mutation addPendingDocumentMutation(
     }
     async fetchCollection(collectionName, includeDocuments, after) {
       if (includeDocuments === true) {
-        if (this.useDataLayer) {
-          const sort = this.schema.getIsTitleFieldName(collectionName);
-          const response = await this.api.request(`#graphql
+        const sort = this.schema.getIsTitleFieldName(collectionName);
+        const response = await this.api.request(`#graphql
       query($collection: String!, $includeDocuments: Boolean!, $sort: String,  $limit: Float, $after: String){
         collection(collection: $collection){
           name
@@ -2540,45 +2538,15 @@ mutation addPendingDocumentMutation(
           }
         }
       }`, {
-            variables: {
-              collection: collectionName,
-              includeDocuments,
-              sort,
-              limit: 10,
-              after
-            }
-          });
-          return response.collection;
-        } else {
-          const response = await this.api.request(`#graphql
-    query($collection: String!, $includeDocuments: Boolean!){
-      collection(collection: $collection){
-        name
-        label
-        format
-        templates
-        documents @include(if: $includeDocuments) {
-          totalCount
-          edges {
-            node {
-              ... on Document {
-                _sys {
-                  template
-                  breadcrumbs
-                  path
-                  basename
-                  relativePath
-                  filename
-                  extension
-                }
-              }
-            }
+          variables: {
+            collection: collectionName,
+            includeDocuments,
+            sort,
+            limit: 10,
+            after
           }
-        }
-      }
-    }`, { variables: { collection: collectionName, includeDocuments } });
-          return response.collection;
-        }
+        });
+        return response.collection;
       } else {
         try {
           const collection = this.schema.getCollection(collectionName);
@@ -4843,7 +4811,6 @@ This will work when developing locally but NOT when deployed to production.
         const documents = collection.documents.edges;
         const admin = cms.api.admin;
         const pageInfo = collection.documents.pageInfo;
-        const useDataFlag = cms.flags.get("experimentalData");
         return /* @__PURE__ */ React__default["default"].createElement(PageWrapper, null, /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, open && /* @__PURE__ */ React__default["default"].createElement(DeleteModal, {
           filename: vars.relativePath,
           deleteFunc: async () => {
@@ -4946,7 +4913,7 @@ This will work when developing locally but NOT when deployed to production.
               }
             ]
           })));
-        }))), useDataFlag && /* @__PURE__ */ React__default["default"].createElement("div", {
+        }))), /* @__PURE__ */ React__default["default"].createElement("div", {
           className: "pt-3"
         }, /* @__PURE__ */ React__default["default"].createElement(toolkit.CursorPaginator, {
           variant: "white",

package/dist/tina-cms.d.ts

@@ -43,7 +43,7 @@ declare type APIProviderProps = {
      */
     branch?: never;
     /**
-     * Your clientID from tina.aio
+     * Your clientId from tina.io
      *
      * @deprecated use apiURL instead
      */
@@ -73,41 +73,11 @@ declare type APIProviderProps = {
      */
     branch?: never;
     /**
-     * Your clientID from tina.aio
+     * Your clientId from tina.io
      *
      * @deprecated use apiURL instead
      */
     clientId?: never;
-} | {
-    /**
-     * 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?: boolean;
-    /**
-     * The base branch to pull content from. Note that this is ignored for local development
-     *
-     * @deprecated use apiURL instead
-     */
-    branch?: string;
-    /**
-     * Your clientID from tina.aio
-     *
-     * @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

@@ -14,7 +14,7 @@ export declare const TINA_HOST = "content.tinajs.io";
 export interface TinaClientArgs<GenQueries = Record<string, unknown>> {
     url: string;
     token?: string;
-    queries?: (client: TinaClient<GenQueries>) => GenQueries;
+    queries: (client: TinaClient<GenQueries>) => GenQueries;
 }
 export declare type TinaClientRequestArgs = {
     variables?: Record<string, any>;
@@ -32,7 +32,7 @@ export declare class TinaClient<GenQueries> {
     /**
      *
      */
-    queries?: GenQueries;
+    queries: GenQueries;
     constructor({ token, url, queries }: TinaClientArgs<GenQueries>);
     request<DataType extends Record<string, any> = any>(args: TinaClientRequestArgs): Promise<{
         data: DataType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "0.68.13",
+  "version": "0.68.14",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -43,9 +43,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "0.0.8",
+    "@tinacms/schema-tools": "0.0.9",
     "@tinacms/sharedctx": "0.1.2",
-    "@tinacms/toolkit": "0.56.35",
+    "@tinacms/toolkit": "0.56.36",
     "crypto-js": "^4.0.0",
     "fetch-ponyfill": "^7.1.0",
     "final-form": "4.20.1",