tinacms 1.0.2 → 1.1.1

package/dist/admin/api.d.ts

@@ -20,7 +20,7 @@ export declare class TinaAdminApi {
     schema: TinaSchema;
     constructor(cms: TinaCMS);
     isAuthenticated(): Promise<boolean>;
-    fetchCollections(): Promise<Collection[]>;
+    fetchCollections(): import("@tinacms/schema-tools").TinaCloudCollection<true>[];
     deleteDocument({ collection, relativePath, }: {
         collection: string;
         relativePath: string;

package/dist/admin/components/GetCollections.d.ts

@@ -10,12 +10,9 @@ 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 type { Collection } from '../types';
 import type { TinaCMS } from '@tinacms/toolkit';
 export declare const useGetCollections: (cms: TinaCMS) => {
-    collections: Collection[];
-    loading: boolean;
-    error: Error;
+    collections: import("@tinacms/schema-tools").TinaCloudCollection<true>[];
 };
 declare const GetCollections: ({ cms, children }: {
     cms: TinaCMS;

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

@@ -10,5 +10,6 @@ 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 declare const LogoutRedirect: () => JSX.Element;
 declare const LogoutPage: () => JSX.Element;
 export default LogoutPage;

package/dist/index.es.js

@@ -12,7 +12,7 @@ import gql$1 from "graphql-tag";
 import * as yup from "yup";
 import { setEditing, TinaDataContext, EditContext, useEditState } from "@tinacms/sharedctx";
 import UrlPattern from "url-pattern";
-import { NavLink, useNavigate, useParams, useLocation, Link, HashRouter, Routes, Route } from "react-router-dom";
+import { NavLink, useSearchParams, useNavigate, useParams, useLocation, Link, HashRouter, Routes, Route } from "react-router-dom";
 import { Transition, Menu } from "@headlessui/react";
 import { useWindowWidth } from "@react-hook/window-size";
 function popupWindow(url, title, window2, w, h) {
@@ -2117,7 +2117,7 @@ const parseRefForBranchName = (ref) => {
 };
 class Client {
   constructor({ tokenStorage = "MEMORY", ...options }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     this.events = new EventBus();
     this.addPendingContent = async (props) => {
       const mutation = `#graphql
@@ -2166,6 +2166,7 @@ mutation addPendingDocumentMutation(
       return parse(data.getOptimizedQuery);
     };
     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 (options.schema) {
       const enrichedSchema = new TinaSchema({
         version: { fullVersion: "", major: "", minor: "", patch: "" },
@@ -2354,7 +2355,7 @@ mutation addPendingDocumentMutation(
   async isAuthenticated() {
     return !!await this.getUser();
   }
-  async onLogout() {
+  async logout() {
     this.setToken(null);
   }
   async authenticate() {
@@ -2434,7 +2435,7 @@ class LocalClient extends Client {
   get isLocalMode() {
     return true;
   }
-  async onLogout() {
+  async logout() {
     localStorage.removeItem(LOCAL_CLIENT_KEY);
   }
   async authenticate() {
@@ -2502,14 +2503,8 @@ class TinaAdminApi {
   async isAuthenticated() {
     return await this.api.isAuthenticated();
   }
-  async fetchCollections() {
-    try {
-      const collections = this.schema.getCollections();
-      return collections;
-    } catch (e) {
-      console.error(`[TinaAdminAPI] Unable to fetchCollections(): ${e.message}`);
-      return [];
-    }
+  fetchCollections() {
+    return this.schema.getCollections();
   }
   async deleteDocument({
     collection,
@@ -4498,28 +4493,7 @@ function ImFilesEmpty(props) {
 }
 const useGetCollections = (cms) => {
   const api = new TinaAdminApi(cms);
-  const [collections, setCollections] = useState([]);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(void 0);
-  useEffect(() => {
-    const fetchCollections = async () => {
-      if (await api.isAuthenticated()) {
-        try {
-          const collections2 = await api.fetchCollections();
-          setCollections(collections2);
-        } catch (error2) {
-          console.error(error2);
-          setCollections([]);
-          setError(error2);
-          throw new Error(`[${error2.name}] GetCollections failed: ${error2.message}`);
-        }
-        setLoading(false);
-      }
-    };
-    setLoading(true);
-    fetchCollections();
-  }, [cms]);
-  return { collections, loading, error };
+  return { collections: api.fetchCollections() };
 };
 function IoMdClose(props) {
   return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 512 512" }, "child": [{ "tag": "path", "attr": { "d": "M405 136.798L375.202 107 256 226.202 136.798 107 107 136.798 226.202 256 107 375.202 136.798 405 256 285.798 375.202 405 405 375.202 285.798 256z" } }] })(props);
@@ -4748,6 +4722,28 @@ const LoginPage = () => {
     className: "w-6 h-auto mr-2 opacity-80"
   }), " Edit With Tina")));
 };
+const LogoutRedirect = () => {
+  const cms = useCMS();
+  const { setEdit } = useEditState();
+  const [searchParams] = useSearchParams();
+  const slug = searchParams.get("slug") || "/";
+  const logout2 = async () => {
+    var _a, _b, _c, _d, _e, _f;
+    if ((_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.logout) {
+      await cms.api.tina.logout();
+      if ((_d = (_c = cms == null ? void 0 : cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.onLogout) {
+        await ((_f = (_e = cms == null ? void 0 : cms.api) == null ? void 0 : _e.tina) == null ? void 0 : _f.onLogout());
+      }
+    }
+    setEdit(false);
+  };
+  useEffect(() => {
+    logout2().then(() => {
+      window.location.href = slug;
+    });
+  }, []);
+  return /* @__PURE__ */ React.createElement("div", null, "Redirecting to ", slug, " ...");
+};
 const logout = () => {
   setEditing(false);
   window.location.href = "/";
@@ -5711,6 +5707,11 @@ const TinaAdmin = ({
         element: /* @__PURE__ */ React.createElement(DefaultWrapper, {
           cms
         }, /* @__PURE__ */ React.createElement(ScreenPage, null))
+      }), /* @__PURE__ */ React.createElement(Route, {
+        path: "logout",
+        element: /* @__PURE__ */ React.createElement(DefaultWrapper, {
+          cms
+        }, /* @__PURE__ */ React.createElement(LogoutRedirect, null))
       }), /* @__PURE__ */ React.createElement(Route, {
         path: "/",
         element: /* @__PURE__ */ React.createElement(MaybeRedirectToPreview, {

package/dist/index.js

@@ -2133,7 +2133,7 @@
   };
   class Client {
     constructor({ tokenStorage = "MEMORY", ...options }) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       this.events = new toolkit.EventBus();
       this.addPendingContent = async (props) => {
         const mutation = `#graphql
@@ -2182,6 +2182,7 @@ mutation addPendingDocumentMutation(
         return G.parse(data.getOptimizedQuery);
       };
       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 (options.schema) {
         const enrichedSchema = new schemaTools.TinaSchema({
           version: { fullVersion: "", major: "", minor: "", patch: "" },
@@ -2370,7 +2371,7 @@ mutation addPendingDocumentMutation(
     async isAuthenticated() {
       return !!await this.getUser();
     }
-    async onLogout() {
+    async logout() {
       this.setToken(null);
     }
     async authenticate() {
@@ -2450,7 +2451,7 @@ mutation addPendingDocumentMutation(
     get isLocalMode() {
       return true;
     }
-    async onLogout() {
+    async logout() {
       localStorage.removeItem(LOCAL_CLIENT_KEY);
     }
     async authenticate() {
@@ -2518,14 +2519,8 @@ mutation addPendingDocumentMutation(
     async isAuthenticated() {
       return await this.api.isAuthenticated();
     }
-    async fetchCollections() {
-      try {
-        const collections = this.schema.getCollections();
-        return collections;
-      } catch (e) {
-        console.error(`[TinaAdminAPI] Unable to fetchCollections(): ${e.message}`);
-        return [];
-      }
+    fetchCollections() {
+      return this.schema.getCollections();
     }
     async deleteDocument({
       collection,
@@ -4514,28 +4509,7 @@ This will work when developing locally but NOT when deployed to production.
   }
   const useGetCollections = (cms) => {
     const api = new TinaAdminApi(cms);
-    const [collections, setCollections] = React.useState([]);
-    const [loading, setLoading] = React.useState(true);
-    const [error, setError] = React.useState(void 0);
-    React.useEffect(() => {
-      const fetchCollections = async () => {
-        if (await api.isAuthenticated()) {
-          try {
-            const collections2 = await api.fetchCollections();
-            setCollections(collections2);
-          } catch (error2) {
-            console.error(error2);
-            setCollections([]);
-            setError(error2);
-            throw new Error(`[${error2.name}] GetCollections failed: ${error2.message}`);
-          }
-          setLoading(false);
-        }
-      };
-      setLoading(true);
-      fetchCollections();
-    }, [cms]);
-    return { collections, loading, error };
+    return { collections: api.fetchCollections() };
   };
   function IoMdClose(props) {
     return GenIcon({ "tag": "svg", "attr": { "viewBox": "0 0 512 512" }, "child": [{ "tag": "path", "attr": { "d": "M405 136.798L375.202 107 256 226.202 136.798 107 107 136.798 226.202 256 107 375.202 136.798 405 256 285.798 375.202 405 405 375.202 285.798 256z" } }] })(props);
@@ -4764,6 +4738,28 @@ This will work when developing locally but NOT when deployed to production.
       className: "w-6 h-auto mr-2 opacity-80"
     }), " Edit With Tina")));
   };
+  const LogoutRedirect = () => {
+    const cms = toolkit.useCMS();
+    const { setEdit } = sharedctx.useEditState();
+    const [searchParams] = reactRouterDom.useSearchParams();
+    const slug = searchParams.get("slug") || "/";
+    const logout2 = async () => {
+      var _a, _b, _c, _d, _e, _f;
+      if ((_b = (_a = cms == null ? void 0 : cms.api) == null ? void 0 : _a.tina) == null ? void 0 : _b.logout) {
+        await cms.api.tina.logout();
+        if ((_d = (_c = cms == null ? void 0 : cms.api) == null ? void 0 : _c.tina) == null ? void 0 : _d.onLogout) {
+          await ((_f = (_e = cms == null ? void 0 : cms.api) == null ? void 0 : _e.tina) == null ? void 0 : _f.onLogout());
+        }
+      }
+      setEdit(false);
+    };
+    React.useEffect(() => {
+      logout2().then(() => {
+        window.location.href = slug;
+      });
+    }, []);
+    return /* @__PURE__ */ React__default["default"].createElement("div", null, "Redirecting to ", slug, " ...");
+  };
   const logout = () => {
     sharedctx.setEditing(false);
     window.location.href = "/";
@@ -5727,6 +5723,11 @@ This will work when developing locally but NOT when deployed to production.
           element: /* @__PURE__ */ React__default["default"].createElement(DefaultWrapper, {
             cms
           }, /* @__PURE__ */ React__default["default"].createElement(ScreenPage, null))
+        }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
+          path: "logout",
+          element: /* @__PURE__ */ React__default["default"].createElement(DefaultWrapper, {
+            cms
+          }, /* @__PURE__ */ React__default["default"].createElement(LogoutRedirect, null))
         }), /* @__PURE__ */ React__default["default"].createElement(reactRouterDom.Route, {
           path: "/",
           element: /* @__PURE__ */ React__default["default"].createElement(MaybeRedirectToPreview, {

package/dist/internalClient/index.d.ts

@@ -35,7 +35,8 @@ interface ServerOptions {
     tokenStorage?: 'MEMORY' | 'LOCAL_STORAGE' | 'CUSTOM';
 }
 export declare class Client {
-    onLogin: OnLoginFunc;
+    onLogin?: OnLoginFunc;
+    onLogout?: () => Promise<void>;
     frontendUrl: string;
     contentApiUrl: string;
     identityApiUrl: string;
@@ -112,7 +113,7 @@ export declare class Client {
     getRefreshedToken(tokens: string): Promise<TokenObject>;
     isAuthorized(): Promise<boolean>;
     isAuthenticated(): Promise<boolean>;
-    onLogout(): Promise<void>;
+    logout(): Promise<void>;
     authenticate(): Promise<TokenObject>;
     /**
      * Wraps the normal fetch function with same API but adds the authorization header token.
@@ -135,7 +136,7 @@ export declare class LocalClient extends Client {
         schema?: TinaCloudSchema<false>;
     } & Omit<ServerOptions, 'clientId' | 'branch'>);
     get isLocalMode(): boolean;
-    onLogout(): Promise<void>;
+    logout(): Promise<void>;
     authenticate(): Promise<{
         access_token: string;
         id_token: string;

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

@@ -51,6 +51,9 @@ declare type BaseComponents = {
     code?: {
         children: JSX.Element;
     };
+    text?: {
+        children: string;
+    };
     ul?: {
         children: JSX.Element;
     };
@@ -60,6 +63,9 @@ declare type BaseComponents = {
     li?: {
         children: JSX.Element;
     };
+    lic?: {
+        children: JSX.Element;
+    };
     block_quote?: {
         children: JSX.Element;
     };

package/dist/rich-text/index.es.js

@@ -79,6 +79,10 @@ const Leaf = (props) => {
       ...rest
     }));
   }
+  if (props.components.text) {
+    const Component = props.components.text;
+    return /* @__PURE__ */ React.createElement(Component, null, props.text);
+  }
   return /* @__PURE__ */ React.createElement(React.Fragment, null, props.text);
 };
 const MemoNode = (props) => {
@@ -117,6 +121,15 @@ const Node = ({ components, child }) => {
         })
       });
     case "lic":
+      if (components.lic) {
+        const Component2 = components.lic;
+        return /* @__PURE__ */ React.createElement(Component2, {
+          ...props
+        }, /* @__PURE__ */ React.createElement(TinaMarkdown, {
+          components,
+          content: children
+        }));
+      }
       return /* @__PURE__ */ React.createElement("div", null, /* @__PURE__ */ React.createElement(TinaMarkdown, {
         components,
         content: child.children

package/dist/rich-text/index.js

@@ -86,6 +86,10 @@
         ...rest
       }));
     }
+    if (props.components.text) {
+      const Component = props.components.text;
+      return /* @__PURE__ */ React__default["default"].createElement(Component, null, props.text);
+    }
     return /* @__PURE__ */ React__default["default"].createElement(React__default["default"].Fragment, null, props.text);
   };
   const MemoNode = (props) => {
@@ -124,6 +128,15 @@
           })
         });
       case "lic":
+        if (components.lic) {
+          const Component2 = components.lic;
+          return /* @__PURE__ */ React__default["default"].createElement(Component2, {
+            ...props
+          }, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
+            components,
+            content: children
+          }));
+        }
         return /* @__PURE__ */ React__default["default"].createElement("div", null, /* @__PURE__ */ React__default["default"].createElement(TinaMarkdown, {
           components,
           content: child.children

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "main": "dist/index.js",
   "module": "./dist/index.es.js",
   "exports": {
@@ -55,9 +55,9 @@
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@react-hook/window-size": "^3.0.7",
-    "@tinacms/schema-tools": "1.0.2",
+    "@tinacms/schema-tools": "1.0.3",
     "@tinacms/sharedctx": "1.0.0",
-    "@tinacms/toolkit": "1.1.0",
+    "@tinacms/toolkit": "1.1.1",
     "crypto-js": "^4.0.0",
     "encoding": "0.1.13",
     "fetch-ponyfill": "^7.1.0",