@akanjs/ui 0.9.57 → 0.9.58-canary.0

package/System/Client.d.ts

@@ -5,7 +5,7 @@ import { HTMLAttributes, RefObject } from "react";
 export declare const Client: {
     (): import("react/jsx-runtime").JSX.Element;
     Wrapper: ({ children, theme, lang, dictionary, signals, reconnect, }: ClientWrapperProps) => import("react/jsx-runtime").JSX.Element;
-    Bridge: ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrackingId }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
+    Bridge: ({ env, lang, theme, prefix, gaTrackingId }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
     Inner: () => import("react/jsx-runtime").JSX.Element;
     NextBridge: ({ lang, prefix }: ClientNextBridgeProps) => null;
 };
@@ -36,17 +36,11 @@ export declare const ClientPathWrapper: ({ className, bind, wrapperRef, pageType
 interface ClientBridgeProps {
     env: BaseClientEnv;
     lang?: string;
-    mePromise?: Promise<{
-        id: string;
-    } | null>;
-    selfPromise?: Promise<{
-        id: string;
-    } | null>;
     theme?: string;
     prefix?: string;
     gaTrackingId?: string;
 }
-export declare const ClientBridge: ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrackingId }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
+export declare const ClientBridge: ({ env, lang, theme, prefix, gaTrackingId }: ClientBridgeProps) => "" | import("react/jsx-runtime").JSX.Element | undefined;
 export declare const ClientInner: () => import("react/jsx-runtime").JSX.Element;
 interface ClientNextBridgeProps {
     lang: string;

package/System/Common.d.ts

@@ -1,7 +1,6 @@
 import "dayjs/locale/ko";
 import { type BaseClientEnv } from "@akanjs/base";
 import { type RootLayoutProps } from "@akanjs/client";
-import { FetchPolicy } from "@akanjs/common";
 import { ReactNode } from "react";
 export interface ProviderProps {
     className?: string;
@@ -17,28 +16,4 @@ export interface ProviderProps {
     reconnect?: boolean;
     of: (props: any) => ReactNode | null;
 }
-export declare const Common: {
-    (): import("react/jsx-runtime").JSX.Element;
-    Wrapper: ({ fetch, render, }: WrapperProps) => import("react/jsx-runtime").JSX.Element;
-};
-export type InitAuthFetchType = typeof window.fetch & {
-    ping: (option?: FetchPolicy) => Promise<any>;
-    me?: (props: {
-        crystalize: boolean;
-    }, option?: FetchPolicy) => Promise<{
-        id: string;
-    }>;
-    getSelf?: (props: {
-        crystalize: boolean;
-    }, option?: FetchPolicy) => Promise<{
-        id: string;
-    }>;
-};
-interface WrapperProps {
-    fetch: InitAuthFetchType;
-    render: (props: {
-        mePromise: Promise<any>;
-        selfPromise: Promise<any>;
-    }) => ReactNode;
-}
-export {};
+export declare const Common: () => import("react/jsx-runtime").JSX.Element;

package/cjs/System/CSR.js

@@ -23,7 +23,6 @@ __export(CSR_exports, {
 });
 module.exports = __toCommonJS(CSR_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_base = require("@akanjs/base");
 var import_client = require("@akanjs/client");
 var import_next = require("@akanjs/next");
 var import_store = require("@akanjs/store");
@@ -33,7 +32,6 @@ var import_react_dom = require("react-dom");
 var import_FontFace = require("../FontFace");
 var import_Load = require("../Load");
 var import_Client = require("./Client");
-var import_Common = require("./Common");
 const CSR = ({ children }) => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {});
 };
@@ -58,10 +56,9 @@ const CSRProvider = ({
       of,
       loader: async () => {
         const { lang } = await params;
-        const fetch = import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch;
-        return { lang, fetch };
+        return { lang };
       },
-      render: ({ lang, fetch }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
+      render: ({ lang }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.Client.Wrapper, { theme, lang, reconnect, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           CSRWrapper,
           {
@@ -75,29 +72,10 @@ const CSRProvider = ({
             children
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          import_Common.Common.Wrapper,
-          {
-            fetch,
-            render: ({ mePromise, selfPromise }) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.Client.Inner, {}),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CSRInner, {}),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                import_Client.Client.Bridge,
-                {
-                  lang,
-                  env,
-                  mePromise,
-                  selfPromise,
-                  theme,
-                  prefix,
-                  gaTrackingId
-                }
-              ),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CSRBridge, { lang, prefix })
-            ] })
-          }
-        )
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.Client.Inner, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CSRInner, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.Client.Bridge, { lang, env, theme, prefix, gaTrackingId }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(CSRBridge, { lang, prefix })
       ] })
     }
   );
@@ -188,7 +166,8 @@ const CSRWrapper = ({
           )
         ]
       }
-    )
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { id: "csr-provider-children", className: "hidden", children })
   ] });
 };
 CSR.Wrapper = CSRWrapper;

package/cjs/System/Client.js

@@ -32,7 +32,6 @@ var import_client = require("@akanjs/client");
 var import_common = require("@akanjs/common");
 var import_constant = require("@akanjs/constant");
 var import_dictionary = require("@akanjs/dictionary");
-var import_next = require("@akanjs/next");
 var import_signal = require("@akanjs/signal");
 var import_store = require("@akanjs/store");
 var import_ui = require("@akanjs/ui");
@@ -124,13 +123,11 @@ const ClientPathWrapper = ({
     }
   );
 };
-const ClientBridge = ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrackingId }) => {
+const ClientBridge = ({ env, lang, theme, prefix, gaTrackingId }) => {
   const uiOperation = import_store.st.use.uiOperation();
   const pathname = import_store.st.use.pathname();
   const params = import_store.st.use.params();
   const searchParams = import_store.st.use.searchParams();
-  const { fulfilled: meFullfilled, value: me } = (0, import_next.useFetch)(mePromise);
-  const { fulfilled: selfFullfilled, value: self } = (0, import_next.useFetch)(selfPromise);
   const language = params.lang ?? lang;
   const path = "/" + pathname.split("/").slice(2).join("/");
   const { setTheme, themes, theme: nextTheme } = (0, import_next_themes.useTheme)();
@@ -138,8 +135,6 @@ const ClientBridge = ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrac
   (0, import_react.useEffect)(() => {
     if (uiOperation !== "sleep")
       return;
-    if (!meFullfilled || !selfFullfilled)
-      return;
     const initTheme = async () => {
       if (theme) {
         setTheme(theme);
@@ -159,14 +154,12 @@ const ClientBridge = ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrac
     const userCnst = import_constant.constantInfo.getDatabase("user", { allowEmpty: true });
     import_store.st.set({
       prefix,
-      uiOperation: "loading",
-      ...me && adminCnst ? { me: adminCnst.crystalize(me) } : {},
-      ...self && userCnst ? { self: userCnst.crystalize(self) } : {}
+      uiOperation: "loading"
     });
     setTimeout(() => {
       import_store.st.set({ uiOperation: "idle" });
     }, 2e3);
-  }, [meFullfilled, selfFullfilled]);
+  }, []);
   (0, import_react.useEffect)(() => {
     if (theme && storeTheme !== nextTheme)
       setTheme(storeTheme);

package/cjs/System/Common.js

@@ -22,43 +22,6 @@ __export(Common_exports, {
 module.exports = __toCommonJS(Common_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_ko = require("dayjs/locale/ko");
-var import_base = require("@akanjs/base");
-var import_client = require("@akanjs/client");
-var import_Load = require("../Load");
 const Common = () => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {});
 };
-const CommonWrapper = ({
-  fetch = import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch,
-  render
-}) => {
-  const account = (0, import_client.getAccount)();
-  const fetchPing = (option) => fetch.ping(option);
-  const fetchMe = (props, option) => fetch.me?.(props, option);
-  const fetchSelf = (props, option) => fetch.getSelf?.(props, option);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    import_Load.Load.Page,
-    {
-      of: CommonWrapper,
-      loader: async () => {
-        const mePromise = (async () => {
-          try {
-            return account.me ? await fetchMe({ crystalize: false }) : null;
-          } catch (e) {
-            return null;
-          }
-        })();
-        const selfPromise = (async () => {
-          try {
-            return account.self ? await fetchSelf({ crystalize: false }) : null;
-          } catch (e) {
-            return null;
-          }
-        })();
-        return Promise.resolve({ mePromise, selfPromise });
-      },
-      render
-    }
-  );
-};
-Common.Wrapper = CommonWrapper;

package/cjs/System/SSR.js

@@ -22,12 +22,10 @@ __export(SSR_exports, {
 });
 module.exports = __toCommonJS(SSR_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_base = require("@akanjs/base");
 var import_client = require("@akanjs/client");
 var import_react = require("react");
 var import_Load = require("../Load");
 var import_Client = require("./Client");
-var import_Common = require("./Common");
 const SSR = () => {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {});
 };
@@ -54,51 +52,34 @@ const SSRProvider = ({
         const { lang } = await params;
         if (!import_client.router.isInitialized)
           import_client.router.init({ type: "next", side: "server", lang, prefix });
-        const fetch = import_base.baseClientEnv.side === "server" && import_base.baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch;
-        return { lang, fetch };
+        return { lang };
       },
-      render: ({ lang, fetch }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        import_Common.Common.Wrapper,
+      render: ({ lang }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+        SSRWrapper,
         {
-          fetch,
-          render: ({ mePromise, selfPromise }) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-            SSRWrapper,
+          className,
+          appName,
+          lang,
+          head,
+          fonts,
+          prefix,
+          layoutStyle,
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+            import_Client.ClientWrapper,
             {
-              className,
-              appName,
+              theme,
               lang,
-              head,
-              fonts,
-              prefix,
-              layoutStyle,
-              children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-                import_Client.ClientWrapper,
-                {
-                  theme,
-                  lang,
-                  dictionary: global.dictionary[lang],
-                  signals: global.signals,
-                  reconnect,
-                  children: [
-                    children,
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, { fallback: null, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.ClientInner, {}) }),
-                    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Suspense, { fallback: null, children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                        import_Client.ClientBridge,
-                        {
-                          env,
-                          mePromise,
-                          selfPromise,
-                          theme,
-                          prefix,
-                          gaTrackingId
-                        }
-                      ),
-                      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.ClientNextBridge, { lang, prefix })
-                    ] })
-                  ]
-                }
-              )
+              dictionary: global.dictionary[lang],
+              signals: global.signals,
+              reconnect,
+              children: [
+                children,
+                /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react.Suspense, { fallback: null, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.ClientInner, {}) }),
+                /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react.Suspense, { fallback: null, children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.ClientBridge, { env, theme, prefix, gaTrackingId }),
+                  /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Client.ClientNextBridge, { lang, prefix })
+                ] })
+              ]
             }
           )
         }

package/esm/System/CSR.js

@@ -1,6 +1,5 @@
 "use client";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { baseClientEnv } from "@akanjs/base";
 import { clsx, device, getPathInfo, router, useCsr } from "@akanjs/client";
 import { usePushNoti } from "@akanjs/next";
 import { st } from "@akanjs/store";
@@ -10,7 +9,6 @@ import { createPortal } from "react-dom";
 import { FontFace } from "../FontFace";
 import { Load } from "../Load";
 import { Client, ClientPathWrapper } from "./Client";
-import { Common } from "./Common";
 const CSR = ({ children }) => {
   return /* @__PURE__ */ jsx("div", {});
 };
@@ -35,10 +33,9 @@ const CSRProvider = ({
       of,
       loader: async () => {
         const { lang } = await params;
-        const fetch = baseClientEnv.side === "server" && baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch;
-        return { lang, fetch };
+        return { lang };
       },
-      render: ({ lang, fetch }) => /* @__PURE__ */ jsxs(Fragment, { children: [
+      render: ({ lang }) => /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(Client.Wrapper, { theme, lang, reconnect, children: /* @__PURE__ */ jsx(
           CSRWrapper,
           {
@@ -52,29 +49,10 @@ const CSRProvider = ({
             children
           }
         ) }),
-        /* @__PURE__ */ jsx(
-          Common.Wrapper,
-          {
-            fetch,
-            render: ({ mePromise, selfPromise }) => /* @__PURE__ */ jsxs(Fragment, { children: [
-              /* @__PURE__ */ jsx(Client.Inner, {}),
-              /* @__PURE__ */ jsx(CSRInner, {}),
-              /* @__PURE__ */ jsx(
-                Client.Bridge,
-                {
-                  lang,
-                  env,
-                  mePromise,
-                  selfPromise,
-                  theme,
-                  prefix,
-                  gaTrackingId
-                }
-              ),
-              /* @__PURE__ */ jsx(CSRBridge, { lang, prefix })
-            ] })
-          }
-        )
+        /* @__PURE__ */ jsx(Client.Inner, {}),
+        /* @__PURE__ */ jsx(CSRInner, {}),
+        /* @__PURE__ */ jsx(Client.Bridge, { lang, env, theme, prefix, gaTrackingId }),
+        /* @__PURE__ */ jsx(CSRBridge, { lang, prefix })
       ] })
     }
   );
@@ -165,7 +143,8 @@ const CSRWrapper = ({
           )
         ]
       }
-    )
+    ),
+    /* @__PURE__ */ jsx("div", { id: "csr-provider-children", className: "hidden", children })
   ] });
 };
 CSR.Wrapper = CSRWrapper;

package/esm/System/Client.js

@@ -15,7 +15,6 @@ import {
 import { Logger } from "@akanjs/common";
 import { constantInfo } from "@akanjs/constant";
 import { serverTranslator } from "@akanjs/dictionary";
-import { useFetch } from "@akanjs/next";
 import { signalInfo } from "@akanjs/signal";
 import { baseSt, st, storeInfo } from "@akanjs/store";
 import { animated } from "@akanjs/ui";
@@ -107,13 +106,11 @@ const ClientPathWrapper = ({
     }
   );
 };
-const ClientBridge = ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrackingId }) => {
+const ClientBridge = ({ env, lang, theme, prefix, gaTrackingId }) => {
   const uiOperation = st.use.uiOperation();
   const pathname = st.use.pathname();
   const params = st.use.params();
   const searchParams = st.use.searchParams();
-  const { fulfilled: meFullfilled, value: me } = useFetch(mePromise);
-  const { fulfilled: selfFullfilled, value: self } = useFetch(selfPromise);
   const language = params.lang ?? lang;
   const path = "/" + pathname.split("/").slice(2).join("/");
   const { setTheme, themes, theme: nextTheme } = useTheme();
@@ -121,8 +118,6 @@ const ClientBridge = ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrac
   useEffect(() => {
     if (uiOperation !== "sleep")
       return;
-    if (!meFullfilled || !selfFullfilled)
-      return;
     const initTheme = async () => {
       if (theme) {
         setTheme(theme);
@@ -142,14 +137,12 @@ const ClientBridge = ({ env, lang, mePromise, selfPromise, theme, prefix, gaTrac
     const userCnst = constantInfo.getDatabase("user", { allowEmpty: true });
     st.set({
       prefix,
-      uiOperation: "loading",
-      ...me && adminCnst ? { me: adminCnst.crystalize(me) } : {},
-      ...self && userCnst ? { self: userCnst.crystalize(self) } : {}
+      uiOperation: "loading"
     });
     setTimeout(() => {
       st.set({ uiOperation: "idle" });
     }, 2e3);
-  }, [meFullfilled, selfFullfilled]);
+  }, []);
   useEffect(() => {
     if (theme && storeTheme !== nextTheme)
       setTheme(storeTheme);

package/esm/System/Common.js

@@ -1,45 +1,8 @@
 import { Fragment, jsx } from "react/jsx-runtime";
 import "dayjs/locale/ko";
-import { baseClientEnv } from "@akanjs/base";
-import { getAccount } from "@akanjs/client";
-import { Load } from "../Load";
 const Common = () => {
   return /* @__PURE__ */ jsx(Fragment, {});
 };
-const CommonWrapper = ({
-  fetch = baseClientEnv.side === "server" && baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch,
-  render
-}) => {
-  const account = getAccount();
-  const fetchPing = (option) => fetch.ping(option);
-  const fetchMe = (props, option) => fetch.me?.(props, option);
-  const fetchSelf = (props, option) => fetch.getSelf?.(props, option);
-  return /* @__PURE__ */ jsx(
-    Load.Page,
-    {
-      of: CommonWrapper,
-      loader: async () => {
-        const mePromise = (async () => {
-          try {
-            return account.me ? await fetchMe({ crystalize: false }) : null;
-          } catch (e) {
-            return null;
-          }
-        })();
-        const selfPromise = (async () => {
-          try {
-            return account.self ? await fetchSelf({ crystalize: false }) : null;
-          } catch (e) {
-            return null;
-          }
-        })();
-        return Promise.resolve({ mePromise, selfPromise });
-      },
-      render
-    }
-  );
-};
-Common.Wrapper = CommonWrapper;
 export {
   Common
 };

package/esm/System/SSR.js

@@ -1,10 +1,8 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import { baseClientEnv } from "@akanjs/base";
 import { clsx, router } from "@akanjs/client";
 import { Suspense } from "react";
 import { Load } from "../Load";
 import { ClientBridge, ClientInner, ClientNextBridge, ClientPathWrapper, ClientWrapper } from "./Client";
-import { Common } from "./Common";
 const SSR = () => {
   return /* @__PURE__ */ jsx(Fragment, {});
 };
@@ -31,51 +29,34 @@ const SSRProvider = ({
         const { lang } = await params;
         if (!router.isInitialized)
           router.init({ type: "next", side: "server", lang, prefix });
-        const fetch = baseClientEnv.side === "server" && baseClientEnv.operationMode === "local" ? global.builtFetch : global.fetch;
-        return { lang, fetch };
+        return { lang };
       },
-      render: ({ lang, fetch }) => /* @__PURE__ */ jsx(
-        Common.Wrapper,
+      render: ({ lang }) => /* @__PURE__ */ jsx(
+        SSRWrapper,
         {
-          fetch,
-          render: ({ mePromise, selfPromise }) => /* @__PURE__ */ jsx(
-            SSRWrapper,
+          className,
+          appName,
+          lang,
+          head,
+          fonts,
+          prefix,
+          layoutStyle,
+          children: /* @__PURE__ */ jsxs(
+            ClientWrapper,
             {
-              className,
-              appName,
+              theme,
               lang,
-              head,
-              fonts,
-              prefix,
-              layoutStyle,
-              children: /* @__PURE__ */ jsxs(
-                ClientWrapper,
-                {
-                  theme,
-                  lang,
-                  dictionary: global.dictionary[lang],
-                  signals: global.signals,
-                  reconnect,
-                  children: [
-                    children,
-                    /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(ClientInner, {}) }),
-                    /* @__PURE__ */ jsxs(Suspense, { fallback: null, children: [
-                      /* @__PURE__ */ jsx(
-                        ClientBridge,
-                        {
-                          env,
-                          mePromise,
-                          selfPromise,
-                          theme,
-                          prefix,
-                          gaTrackingId
-                        }
-                      ),
-                      /* @__PURE__ */ jsx(ClientNextBridge, { lang, prefix })
-                    ] })
-                  ]
-                }
-              )
+              dictionary: global.dictionary[lang],
+              signals: global.signals,
+              reconnect,
+              children: [
+                children,
+                /* @__PURE__ */ jsx(Suspense, { fallback: null, children: /* @__PURE__ */ jsx(ClientInner, {}) }),
+                /* @__PURE__ */ jsxs(Suspense, { fallback: null, children: [
+                  /* @__PURE__ */ jsx(ClientBridge, { env, theme, prefix, gaTrackingId }),
+                  /* @__PURE__ */ jsx(ClientNextBridge, { lang, prefix })
+                ] })
+              ]
             }
           )
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/ui",
-  "version": "0.9.57",
+  "version": "0.9.58-canary.0",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"