From 4162b9878a8607d9de8f60c51b95acbafe048dc8 Mon Sep 17 00:00:00 2001
From: dswbx <dennis.senn@gmx.ch>
Date: Thu, 12 Jun 2025 09:45:14 +0200
Subject: [PATCH] fix admin controller to only serve if defined, and only from
 specified endpoints

---
 app/src/adapter/vite/vite.adapter.ts       | 26 +++++++++-------------
 app/src/modules/server/AdminController.tsx |  2 +-
 examples/astro/astro.config.mjs            |  4 ++--
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/src/adapter/vite/vite.adapter.ts b/app/src/adapter/vite/vite.adapter.ts
index 84d7396..c69bc1e 100644
--- a/app/src/adapter/vite/vite.adapter.ts
+++ b/app/src/adapter/vite/vite.adapter.ts
@@ -1,24 +1,17 @@
 import { serveStatic } from "@hono/node-server/serve-static";
-import {
-   type DevServerOptions,
-   default as honoViteDevServer,
-} from "@hono/vite-dev-server";
+import { type DevServerOptions, default as honoViteDevServer } from "@hono/vite-dev-server";
 import type { App } from "bknd";
-import {
-   type RuntimeBkndConfig,
-   createRuntimeApp,
-   type FrameworkOptions,
-} from "bknd/adapter";
+import { type RuntimeBkndConfig, createRuntimeApp, type FrameworkOptions } from "bknd/adapter";
 import { registerLocalMediaAdapter } from "bknd/adapter/node";
 import { devServerConfig } from "./dev-server-config";
+import type { MiddlewareHandler } from "hono";
 
 export type ViteEnv = NodeJS.ProcessEnv;
-export type ViteBkndConfig<Env = ViteEnv> = RuntimeBkndConfig<Env> & {};
+export type ViteBkndConfig<Env = ViteEnv> = RuntimeBkndConfig<Env> & {
+   serveStatic?: false | MiddlewareHandler;
+};
 
-export function addViteScript(
-   html: string,
-   addBkndContext: boolean = true,
-) {
+export function addViteScript(html: string, addBkndContext: boolean = true) {
    return html.replace(
       "</head>",
       `<script type="module">
@@ -48,7 +41,10 @@ async function createApp<ViteEnv>(
                mainPath: "/src/main.tsx",
             },
          },
-         serveStatic: ["/assets/*", serveStatic({ root: config.distPath ?? "./" })],
+         serveStatic: config.serveStatic || [
+            "/assets/*",
+            serveStatic({ root: config.distPath ?? "./" }),
+         ],
       },
       env,
       opts,
diff --git a/app/src/modules/server/AdminController.tsx b/app/src/modules/server/AdminController.tsx
index af933ee..6dd39e7 100644
--- a/app/src/modules/server/AdminController.tsx
+++ b/app/src/modules/server/AdminController.tsx
@@ -50,7 +50,7 @@ export class AdminController extends Controller {
    }
 
    get basepath() {
-      return this.options.basepath ?? "/";
+      return this.withAdminBasePath();
    }
 
    private withBasePath(route: string = "") {
diff --git a/examples/astro/astro.config.mjs b/examples/astro/astro.config.mjs
index ba9a322..6ffdbfc 100644
--- a/examples/astro/astro.config.mjs
+++ b/examples/astro/astro.config.mjs
@@ -5,6 +5,6 @@ import react from "@astrojs/react";
 
 // https://astro.build/config
 export default defineConfig({
-   output: "hybrid",
-   integrations: [react()]
+   output: "server",
+   integrations: [react()],
 });