diff --git a/app/src/App.ts b/app/src/App.ts index a617a0a..b5cd50a 100644 --- a/app/src/App.ts +++ b/app/src/App.ts @@ -29,7 +29,7 @@ export type CreateAppConfig = { }; initialConfig?: InitialModuleConfigs; plugins?: AppPlugin[]; - options?: ModuleManagerOptions; + options?: Omit; }; export type AppConfig = InitialModuleConfigs; diff --git a/app/src/modules/server/AdminController.tsx b/app/src/modules/server/AdminController.tsx index 522c55a..12a25fd 100644 --- a/app/src/modules/server/AdminController.tsx +++ b/app/src/modules/server/AdminController.tsx @@ -10,7 +10,9 @@ import * as SystemPermissions from "modules/permissions"; const htmlBkndContextReplace = ""; +// @todo: add migration to remove admin path from config export type AdminControllerOptions = { + basepath?: string; html?: string; forceDev?: boolean; }; @@ -25,8 +27,12 @@ export class AdminController implements ClassController { return this.app.modules.ctx(); } + get basepath() { + return this.options.basepath ?? "/"; + } + private withBasePath(route: string = "") { - return (this.app.modules.configs().server.admin.basepath + route).replace(/\/+$/, "/"); + return (this.basepath + route).replace(/\/+$/, "/"); } getController(): Hono {