@kyro-cms/admin 0.12.10 → 0.12.15

package/src/integration.ts

@@ -176,12 +176,12 @@ export function kyroAdmin(options: KyroAdminOptions = {}): AstroIntegration {
               {
                 name: "kyro-plugins-virtual",
                 resolveId(id: string) {
-                  if (id === "virtual:kyro-plugins") {
-                    return "\0virtual:kyro-plugins";
+                  if (id === "virtual:kyro-plugins" || id.endsWith("virtual-kyro-plugins") || id.endsWith("virtual-kyro-plugins.ts") || id.endsWith("virtual-kyro-plugins.js")) {
+                    return "\0virtual-kyro-plugins";
                   }
                 },
                 load(id: string) {
-                  if (id === "\0virtual:kyro-plugins") {
+                  if (id === "\0virtual-kyro-plugins") {
                     try {
                       const configData = JSON.parse(fs.readFileSync(configFile, "utf8"));
                       const pluginsWithAdmin = (configData.plugins || []).filter((p: any) => p.adminEntry);
@@ -207,18 +207,7 @@ export function kyroAdmin(options: KyroAdminOptions = {}): AstroIntegration {
                 name: "kyro-admin-tsx-loader",
                 enforce: "pre" as const,
                 config(_config: any) {
-                  const existingEsbuild = _config.esbuild;
-                  const existingExclude = existingEsbuild?.exclude;
-                  const adminInclude = /\/node_modules\/(?!.*@kyro-cms\/(admin|core))/;
                   return {
-                    esbuild: {
-                      ...(existingEsbuild || {}),
-                      exclude: existingExclude
-                        ? Array.isArray(existingExclude)
-                          ? [...existingExclude, adminInclude]
-                          : [existingExclude, adminInclude]
-                        : adminInclude,
-                    },
                   };
                 },
               },
@@ -272,7 +261,6 @@ export default debug;
             },
             optimizeDeps: {
               include: [
-                '@kyro-cms/admin',
                 '@kyro-cms/admin > recharts',
                 '@kyro-cms/admin > recharts > recharts-scale',
                 '@kyro-cms/admin > recharts > recharts-scale > decimal.js-light',
@@ -290,7 +278,7 @@ export default debug;
                 '@kyro-cms/admin > use-sync-external-store',
                 '@kyro-cms/admin > use-sync-external-store/with-selector.js',
               ],
-              exclude: ['debug', 'react/compiler-runtime'],
+              exclude: ['debug', 'react/compiler-runtime', '@kyro-cms/admin'],
             },
             define: {
               __KYRO_ADMIN_PATH__: JSON.stringify(basePath),

package/src/layouts/AdminLayout.astro

@@ -8,8 +8,8 @@ import { AuthBridge } from "../components/AuthBridge";
 import { GlobalModal } from "../components/ui/GlobalModal";
 import { Toaster } from "../components/ui/Toaster";
 import { getSiteSettings, getGlobal } from "../lib/globals";
-import { ClientRouter } from 'astro:transitions';
-import LoadingIndicator from 'astro-loading-indicator/component';
+import { ClientRouter } from "astro:transitions";
+import LoadingIndicator from "astro-loading-indicator/component";
 
 interface Props {
   title: string;
@@ -107,7 +107,7 @@ const defaultLang = siteSettings?.defaultLanguage || "en";
             window.dispatchEvent(
               new CustomEvent("kyro:auth-ready", {
                 detail: { user, permissions },
-              })
+              }),
             );
           }
 
@@ -164,7 +164,9 @@ const defaultLang = siteSettings?.defaultLanguage || "en";
         }
       };
 
-      runAuthCheck().then(() => { initialAuthDone = true; });
+      runAuthCheck().then(() => {
+        initialAuthDone = true;
+      });
       document.addEventListener("astro:page-load", () => {
         if (initialAuthDone) runAuthCheck();
       });
@@ -342,7 +344,8 @@ const defaultLang = siteSettings?.defaultLanguage || "en";
     <!-- Theme UI Logic -->
     <script is:inline define:vars={{ adminPath, apiPath }}>
       // Run immediately to prevent FOUC
-      const currentTheme = localStorage.getItem("theme") || (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
+      const currentTheme =
+        localStorage.getItem("theme") || (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light");
       if (currentTheme === "dark") {
         document.documentElement.classList.add("dark");
       } else {
@@ -394,7 +397,10 @@ const defaultLang = siteSettings?.defaultLanguage || "en";
         };
 
         // Sync buttons on page load
-        updateUI(localStorage.getItem("theme") || (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"));
+        updateUI(
+          localStorage.getItem("theme") ||
+            (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light"),
+        );
 
         // Listeners
         lightBtn?.addEventListener("click", () => {
@@ -453,19 +459,23 @@ const defaultLang = siteSettings?.defaultLanguage || "en";
       }
     </script>
     <script>
-      import { navigate } from 'astro:transitions/client';
-      
-      window.addEventListener('kyro:soft-reload', () => {
+      import { navigate } from '../lib/navigate';
+
+      window.addEventListener("kyro:soft-reload", () => {
         const url = new URL(window.location.href);
-        url.searchParams.set('_r', Date.now().toString());
-        navigate(url.toString(), { history: 'replace' });
+        url.searchParams.set("_r", Date.now().toString());
+        navigate(url.toString(), { history: "replace" });
       });
 
-      document.addEventListener('astro:page-load', () => {
+      document.addEventListener("astro:page-load", () => {
         const url = new URL(window.location.href);
-        if (url.searchParams.has('_r')) {
-          url.searchParams.delete('_r');
-          window.history.replaceState(null, '', url.toString() === url.origin + url.pathname ? url.pathname : url.toString());
+        if (url.searchParams.has("_r")) {
+          url.searchParams.delete("_r");
+          window.history.replaceState(
+            null,
+            "",
+            url.toString() === url.origin + url.pathname ? url.pathname : url.toString(),
+          );
         }
       });
     </script>

package/src/layouts/AuthLayout.astro

@@ -15,6 +15,7 @@ const brandSettings = await getBrandSettings({ request: Astro.request });
 const seoSettings = await getGlobal("seo-settings", { request: Astro.request });
 
 const siteName = siteSettings?.siteName || brandSettings?.companyInfo?.companyName || "Kyro CMS";
+const showSiteName = brandSettings?.identity?.showSiteName ?? true;
 const siteFavicon = siteSettings?.siteFavicon || brandSettings?.identity?.favicon;
 const siteLogo = brandSettings?.identity?.primaryLogo || siteSettings?.siteLogo;
 const darkLogo = brandSettings?.identity?.darkLogo;
@@ -121,17 +122,21 @@ const defaultLang = siteSettings?.defaultLanguage || "en";
                       />
                     )}
                   </div>
-                  <span class="text-xl font-bold tracking-tighter text-[var(--kyro-text-primary)]">
-                    {siteName}
-                  </span>
+                  {showSiteName && (
+                    <span class="text-xl font-bold tracking-tighter text-[var(--kyro-text-primary)]">
+                      {siteName}
+                    </span>
+                  )}
                 </div>
               ) : (
                 <>
                   <img src="/logo-white.svg" alt="Kyro CMS" class="w-7 h-7 hidden dark:block" />
                   <img src="/logo.svg" alt="Kyro CMS" class="w-7 h-7 block dark:hidden" />
-                  <span class="text-xl font-bold tracking-tighter text-[var(--kyro-text-primary)]">
-                    {siteName}
-                  </span>
+                  {showSiteName && (
+                    <span class="text-xl font-bold tracking-tighter text-[var(--kyro-text-primary)]">
+                      {siteName}
+                    </span>
+                  )}
                 </>
               )
             }

package/src/lib/navigate.ts

@@ -0,0 +1,15 @@
+export const navigate = (href: string, options?: any) => {
+  if (typeof window === 'undefined') return;
+  
+  import("astro:transitions/client")
+    .then((m) => {
+      if (m && m.navigate) {
+        m.navigate(href, options);
+      } else {
+        window.location.href = href;
+      }
+    })
+    .catch(() => {
+      window.location.href = href;
+    });
+};

package/src/lib/virtual-kyro-plugins.ts

@@ -0,0 +1,2 @@
+export const projectConfig: any = null;
+export const pluginViews: any = {};

package/src/plugins/seo-admin.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { useToast } from '../index';
+import { useToast } from "../components/ui/Toast";
 
 export default function SeoSettings() {
   const [loading, setLoading] = useState(true);