cabloy 5.1.51 → 5.1.53

package/zova/src/front/config/config/config.ts

@@ -39,7 +39,7 @@ export default function (sys: ZovaSys) {
   config.ssr = {
     cookie: env.SSR_COOKIE === 'true',
     withVona: env.SSR_WITH_VONA === 'true',
-    ignoreCookieOnServer: process.env.SERVER && env.SSR_COOKIE === 'false',
+    cookieDisabledOnServer: process.env.SERVER && env.SSR_COOKIE === 'false',
     hmr: env.SSR_WITH_VONA === 'true' && env.META_MODE === 'development',
   };
 

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/index.ts

@@ -46,6 +46,7 @@ export * from '../page/routeQuery/controller.jsx';
 export * from '../page/routeQueryB/controller.jsx';
 export * from '../page/state/controller.jsx';
 export * from '../page/style/controller.jsx';
+export * from '../page/toolMinimal/controller.jsx';
 export * from '../page/toolOne/controller.jsx';
 export * from '../page/toolTwo/controller.jsx';
 
@@ -111,6 +112,11 @@ declare module 'zova-module-demo-basic' {
           get scope(): ScopeModuleDemoBasic;
         }
 
+        export interface ControllerPageToolMinimal {
+          /** @internal */
+          get scope(): ScopeModuleDemoBasic;
+        }
+
         export interface ControllerPageToolOne {
           /** @internal */
           get scope(): ScopeModuleDemoBasic;
@@ -134,6 +140,7 @@ import { ControllerPageRouteQuery } from '../page/routeQuery/controller.jsx';
 import { ControllerPageRouteQueryB } from '../page/routeQueryB/controller.jsx';
 import { ControllerPageState } from '../page/state/controller.jsx';
 import { ControllerPageStyle } from '../page/style/controller.jsx';
+import { ControllerPageToolMinimal } from '../page/toolMinimal/controller.jsx';
 import { ControllerPageToolOne } from '../page/toolOne/controller.jsx';
 import { ControllerPageToolTwo } from '../page/toolTwo/controller.jsx';
 import 'zova';
@@ -150,6 +157,7 @@ declare module 'zova' {
 'demo-basic.controller.pageRouteQueryB': ControllerPageRouteQueryB;
 'demo-basic.controller.pageState': ControllerPageState;
 'demo-basic.controller.pageStyle': ControllerPageStyle;
+'demo-basic.controller.pageToolMinimal': ControllerPageToolMinimal;
 'demo-basic.controller.pageToolOne': ControllerPageToolOne;
 'demo-basic.controller.pageToolTwo': ControllerPageToolTwo;
   }
@@ -166,6 +174,7 @@ export * from './page/routeQueryB.js';
 import { NSControllerPageRouteQueryB } from './page/routeQueryB.js';
 export * from './page/state.js';
 export * from './page/style.js';
+export * from './page/toolMinimal.js';
 export * from './page/toolOne.js';
 import { NSControllerPageToolOne } from './page/toolOne.js';
 export * from './page/toolTwo.js';
@@ -182,11 +191,13 @@ export interface IPagePathRecord {
 '/demo/basic/routeQueryB': TypePagePathSchema<NSControllerPageRouteQueryB.ParamsInput,NSControllerPageRouteQueryB.QueryInput>;
 '/demo/basic/state': TypePagePathSchema<undefined,undefined>;
 '/demo/basic/style': TypePagePathSchema<undefined,undefined>;
+'/demo/basic/toolMinimal': TypePagePathSchema<undefined,undefined>;
 '/demo/basic/toolOne/:id?': TypePagePathSchema<NSControllerPageToolOne.ParamsInput,NSControllerPageToolOne.QueryInput>;
 '/demo/basic/toolTwo/:id?': TypePagePathSchema<NSControllerPageToolTwo.ParamsInput,NSControllerPageToolTwo.QueryInput>;
 }
 export interface IPageNameRecord {
   'demo-basic:routeParams': undefined;
+'demo-basic:toolMinimal': undefined;
 'demo-basic:toolOne': undefined;
 'demo-basic:toolTwo': undefined;
 }

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `demo-basic::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-demo/modules/demo-basic/src/.metadata/page/toolMinimal.ts

@@ -0,0 +1,9 @@
+import { createZovaComponentPage } from 'zova';
+
+import { ControllerPageToolMinimal } from '../../page/toolMinimal/controller.jsx';
+
+export const ZPageToolMinimal = createZovaComponentPage(
+  ControllerPageToolMinimal,
+  undefined,
+  undefined,
+);

package/zova/src/suite/a-demo/modules/demo-basic/src/page/toolMinimal/controller.tsx

@@ -0,0 +1,11 @@
+import { BeanControllerPageBase } from 'zova';
+import { Controller } from 'zova-module-a-bean';
+
+@Controller()
+export class ControllerPageToolMinimal extends BeanControllerPageBase {
+  protected async __init__() {}
+
+  protected render() {
+    return <div>minimal</div>;
+  }
+}

package/zova/src/suite/a-demo/modules/demo-basic/src/routes.ts

@@ -7,6 +7,7 @@ import { ZPageRouteQuery } from './.metadata/page/routeQuery.js';
 import { ZPageRouteQueryB } from './.metadata/page/routeQueryB.js';
 import { ZPageState } from './.metadata/page/state.js';
 import { ZPageStyle } from './.metadata/page/style.js';
+import { ZPageToolMinimal } from './.metadata/page/toolMinimal.js';
 import { ZPageToolOne } from './.metadata/page/toolOne.js';
 import { ZPageToolTwo } from './.metadata/page/toolTwo.js';
 
@@ -26,6 +27,15 @@ export const routes: IModuleRoute[] = [
     },
   },
   { path: 'routeQueryB', component: ZPageRouteQueryB, meta: { requiresAuth: false } },
+  {
+    name: 'toolMinimal',
+    path: 'toolMinimal',
+    component: ZPageToolMinimal,
+    meta: {
+      layout: 'empty',
+      requiresAuth: false,
+    },
+  },
   {
     name: 'toolOne',
     path: 'toolOne/:id?',

package/zova/src/suite/a-devui/modules/devui-adapter/src/bean/meta.themeHandler.ts

@@ -26,6 +26,7 @@ export class MetaThemeHandler extends BeanBase implements IThemeHandler {
     } else {
       // server
       if (!this.sys.config.ssr.cookie) {
+        // BeanTheme applies twice in SSR Web mode so both dark/light markers are available here.
         this.$useMeta({ bodyAttr: { [`data-ssr-theme-dark-${dark}`]: themeName } });
       } else {
         this.$useMeta({

package/zova/src/suite/a-home/modules/home-base/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-base::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -15,7 +15,7 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
   protected onRouterGuards(router: BeanRouter) {
     router.beforeEach(async to => {
       if (
-        !this.sys.config.ssr.ignoreCookieOnServer &&
+        !this.sys.config.ssr.cookieDisabledOnServer &&
         to.meta.requiresAuth !== false &&
         !this.$passport.isAuthenticated
       ) {

package/zova/src/suite/a-home/modules/home-base/src/service/ssrLayout.ts

@@ -20,6 +20,7 @@ export class ServiceSsrLayout extends BeanBase {
       this.ctx.meta.$ssr.context.onRendered((err?: Error) => {
         if (err) return;
         if (!this.sys.config.ssr.cookie) {
+          // Apply the final browser-selected theme from the SSR dual markers as early as possible.
           this.ctx.meta.$ssr.context._meta.bodyTags += `<script id="__prefersColorSchemeDarkJS">
             document.body.setAttribute('data-theme', window.ssr_themedark_data);
             if(window.ssr_local_themename==='home-theme:orange'){

package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-layoutadmin::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-layoutweb::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/controller.tsx

@@ -1,4 +1,4 @@
-import { BeanControllerBase, Use, useComputed, UseScope } from 'zova';
+import { BeanControllerBase, Use, UseScope } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { $QueryAutoLoad } from 'zova-module-a-model';
 import { ModelTabs, ModelTabsOptions, RouteTabInitial } from 'zova-module-a-routertabs';
@@ -37,7 +37,7 @@ export class ControllerLayoutWeb extends BeanControllerBase {
 
   protected async __init__() {
     // belowBreakpoint
-    this.belowBreakpoint = useComputed(() => {
+    this.belowBreakpoint = this.$computed(() => {
       let width;
       if (process.env.SERVER) {
         width = 0;

package/zova/src/suite/a-home/modules/home-login/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `home-login::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/a-home/modules/home-passport/src/model/passport.ts

@@ -37,7 +37,7 @@ export class ModelPassport extends BeanModelBase {
       : this.$useStateMem({ queryKey: ['passport'] });
     this.jwt = this.$useStateLocal({ queryKey: ['jwt'] });
     this.expireTime = this.$useStateLocal({ queryKey: ['expireTime'] });
-    this.accessToken = this.sys.config.ssr.ignoreCookieOnServer
+    this.accessToken = this.sys.config.ssr.cookieDisabledOnServer
       ? undefined
       : this.$useStateCookie({ queryKey: ['token'] });
     if (process.env.CLIENT) {
@@ -153,7 +153,7 @@ export class ModelPassport extends BeanModelBase {
 
   async ensurePassport() {
     if (process.env.CLIENT) return this.passport;
-    if (!this.sys.config.ssr.ignoreCookieOnServer && !this.isAuthenticated && this.accessToken) {
+    if (!this.sys.config.ssr.cookieDisabledOnServer && !this.isAuthenticated && this.accessToken) {
       this.passport = await this.$api.homeUserPassport.current();
       this._setLocaleTz();
     }

package/zova/src/suite/cabloy-basic/modules/basic-captcha/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-captcha::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-form/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-form::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-page/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-page::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-pageentry/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-pageentry::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite/cabloy-basic/modules/basic-table/src/.metadata/locales.ts

@@ -1,7 +1,3 @@
-import type { TypeLocaleBase } from 'zova';
-
-import { useApp, useComputed } from 'zova';
-
 import locale_en_us from '../config/locale/en-us.js';
 import locale_zh_cn from '../config/locale/zh-cn.js';
 
@@ -9,14 +5,3 @@ export const locales = {
   'en-us': locale_en_us,
   'zh-cn': locale_zh_cn,
 };
-
-export function $useLocale<K extends keyof (typeof locales)[TypeLocaleBase]>(
-  key: K,
-  ...args: any[]
-) {
-  const app = useApp();
-  const str = `basic-table::${key}`;
-  return useComputed(() => {
-    return app.meta.text(str, ...args);
-  });
-}

package/zova/src/suite-vendor/a-zova/modules/a-interceptor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-interceptor",
-  "version": "5.1.22",
+  "version": "5.1.23",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-interceptor/src/bean/interceptor.jwt.ts

@@ -55,7 +55,7 @@ export class InterceptorJwt
     authToken: string | boolean | undefined,
   ): Promise<string | undefined> {
     if (!this.sys.config.api.jwt) return;
-    if (this.sys.config.ssr.ignoreCookieOnServer) return;
+    if (this.sys.config.ssr.cookieDisabledOnServer) return;
     // use default in scope.config rather than IInterceptorOptionsJwt.options
     const authTokenCurrent = authToken ?? this.scope.config.authToken.default;
     // authToken = authToken ?? this.scope.config.authToken.default;

package/zova/src/suite-vendor/a-zova/modules/a-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-model",
-  "version": "5.1.23",
+  "version": "5.1.24",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "core",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-model/src/service/storage.ts

@@ -10,11 +10,10 @@ export class ServiceStorage extends BeanBase {
 
   async moduleLoaded() {
     // options
-    let options = this.scope.config.queryClientConfig.defaultOptions;
+    const options = deepExtend({}, this.scope.config.queryClientConfig.defaultOptions);
     if (process.env.SERVER) {
-      options = deepExtend({}, options, {
-        queries: { gcTime: Infinity },
-      });
+      options.queries ??= {};
+      options.queries.gcTime = Infinity;
     }
     // queryCache
     const queryCache = new QueryCache();
@@ -39,7 +38,7 @@ export class ServiceStorage extends BeanBase {
             },
           });
         }
-        this._queryClient.clear();
+        this._queryClient?.clear();
       });
     }
     // client

package/zova/src/suite-vendor/a-zova/modules/a-openapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-openapi",
-  "version": "5.1.30",
+  "version": "5.1.31",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-openapi/src/monkey.ts

@@ -22,7 +22,7 @@ export class Monkey extends BeanSimple implements IMonkeyModule, IMonkeyBeanInit
     if (this._moduleSelf === module) {
       await this._loadSdk();
       this.ctx.util.instanceScope(() => {
-        return watch(
+        watch(
           () => {
             return this.app.meta.locale.current;
           },

package/zova/src/suite-vendor/a-zova/modules/a-ssr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssr",
-  "version": "5.1.18",
+  "version": "5.1.20",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssr.ts

@@ -1,5 +1,5 @@
 import type { ComponentInternalInstance, Ref, VNode } from 'vue';
-import type { Functionable } from 'zova';
+import type { Functionable, ZovaContext } from 'zova';
 
 import { includeBooleanAttr, isBooleanAttr, isString, stringifyStyle } from '@vue/shared';
 import { defu } from 'defu';
@@ -23,6 +23,7 @@ const SymbolOnHydrateds = Symbol('SymbolOnHydrateds');
 const SymbolOnHydratePropHasMismatches = Symbol('SymbolOnHydratePropHasMismatches');
 const SymbolInstanceUpdates = Symbol('SymbolInstanceUpdates');
 const SymbolHydratingCounter = Symbol('SymbolHydratingCounter');
+const SymbolServerContexts = Symbol('SymbolServerContexts');
 
 export class CtxSSR extends BeanSimple {
   private [SymbolIsRuntimeSsrPreHydration]: Ref<boolean> = ref(false);
@@ -33,11 +34,15 @@ export class CtxSSR extends BeanSimple {
   private [SymbolInstanceUpdates]: ComponentInternalInstance[] = [];
 
   private [SymbolHydratingCounter]: number = 0;
+  private [SymbolServerContexts]: Set<ZovaContext> = new Set();
 
   public metaStore: CtxSSRMetaStore;
 
   /** @internal */
   public initialize() {
+    if (process.env.SERVER) {
+      this._serverContextRegister();
+    }
     // ssr state
     this[SymbolSSRState] = this.sys.bean._getBeanSyncOnly('a-ssr.sys.ssrState');
     // SymbolIsRuntimeSsrPreHydration
@@ -63,6 +68,26 @@ export class CtxSSR extends BeanSimple {
     }
   }
 
+  private _serverContextRegister(currentContext: ZovaContext = this.ctx) {
+    const serverContexts = this[SymbolServerContexts];
+    serverContexts.add(currentContext);
+    this.context.onRendered(() => {
+      serverContexts.delete(currentContext);
+    });
+  }
+
+  private _serverContextsDispose() {
+    const serverContexts = this[SymbolServerContexts];
+    for (const serverContext of serverContexts) {
+      if (serverContext.disposed) continue;
+      if (serverContext.bean && serverContext.bean !== serverContext.app?.bean) {
+        serverContext.bean.dispose();
+      }
+      serverContext.dispose();
+    }
+    serverContexts.clear();
+  }
+
   get isRuntimeSsrPreHydration() {
     return this[SymbolIsRuntimeSsrPreHydration].value;
   }
@@ -265,4 +290,14 @@ export class CtxSSR extends BeanSimple {
     }
     return false;
   }
+
+  /** @internal */
+  public _registerServerContext(currentContext: ZovaContext) {
+    this._serverContextRegister(currentContext);
+  }
+
+  /** @internal */
+  public _disposeServerContexts() {
+    this._serverContextsDispose();
+  }
 }

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/lib/ssrMetaStore.ts

@@ -32,13 +32,18 @@ export class CtxSSRMetaStore extends BeanSimple {
   }
 
   private _onRenderedLast(err?: Error) {
-    if (!err) {
+    const app = this.app;
+    try {
+      if (err) return;
+
       const ssrContext = this.ctx.meta.$ssr.context;
       this._injectContextState(ssrContext);
       this._injectContextStateDefer(ssrContext);
       this._injectServerMeta(ssrContext);
+    } finally {
+      this.ctx.meta.$ssr._disposeServerContexts();
+      app?.close();
     }
-    this.app.close();
   }
 
   addMetaOptions(metaOptionsWrapper: SSRMetaOptionsWrapper) {
@@ -159,6 +164,7 @@ export class CtxSSRMetaStore extends BeanSimple {
           ssr_local_themedark=window.matchMedia('(prefers-color-scheme: dark)').matches;
         }
         window.ssr_themedark=window.ssr_local_themedark=ssr_local_themedark;`;
+    // Resolve the final browser theme from the SSR dual markers emitted before page render.
     ssr_local_themedark += `Object.defineProperty(window, 'ssr_themedark_data', {
           get: () => {
             let _data=document.body.getAttribute('data-ssr-theme-dark-'+window.ssr_themedark);

package/zova/src/suite-vendor/a-zova/modules/a-ssr/src/monkey.ts

@@ -22,6 +22,9 @@ export class Monkey
 {
   appContextInitialize(ctx: ZovaContext): void {
     ctx.meta.$ssr = ctx.app.ctx.meta.$ssr;
+    if (process.env.SERVER) {
+      ctx.meta.$ssr._registerServerContext(ctx);
+    }
   }
 
   async appInitialize() {

package/zova/src/suite-vendor/a-zova/modules/a-ssrserver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-ssrserver",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "",
   "keywords": [