zova-ui-vuetify 5.1.49 → 5.1.50

package/env/.env

@@ -51,8 +51,7 @@ PROXY_API_ENABLED = true
 PROXY_API_BASE_URL = http://localhost:$MOCK_BUILD_PORT
 PROXY_API_PREFIX = $API_PREFIX
 
-SSR_COOKIE_LOCALE = false
-SSR_COOKIE_THEME = false
+SSR_COOKIE = false
 SSR_COOKIE_THEMEDARK_DEFAULT = true
 SSR_BODYREADYOBSERVER = false
 SSR_API_BASE_URL = $API_BASE_URL

package/env/.env.spa.cabloyStartAdmin

@@ -9,7 +9,6 @@ PROJECT_DISABLED_SUITES = a-demo
 
 STYLE_DEFAULT_THEME = home-theme:orange
 
-SSR_COOKIE_LOCALE = true
-SSR_COOKIE_THEME = true
+SSR_COOKIE = true
 SSR_BODYREADYOBSERVER = true
 SSR_HMR = true

package/env/.env.spa.cabloyStartWeb

@@ -10,7 +10,6 @@ LAYOUT_SIDEBAR_LEFTOPENPC = false
 
 STYLE_DEFAULT_THEME = home-theme:orange
 
-SSR_COOKIE_LOCALE = false
-SSR_COOKIE_THEME = false
+SSR_COOKIE = false
 SSR_BODYREADYOBSERVER = false
 SSR_HMR = true

package/env/.env.ssr.admin

@@ -1,5 +1,4 @@
-SSR_COOKIE_LOCALE = true
-SSR_COOKIE_THEME = true
+SSR_COOKIE = true
 SSR_BODYREADYOBSERVER = true
 SSR_TRANSFERCACHE = true
 SSR_TRANSFERCACHE_EXPIRES = 0

package/env/.env.ssr.cabloyStartAdmin

@@ -9,8 +9,7 @@ PROJECT_DISABLED_SUITES = a-demo
 
 STYLE_DEFAULT_THEME = home-theme:orange
 
-SSR_COOKIE_LOCALE = true
-SSR_COOKIE_THEME = true
+SSR_COOKIE = true
 SSR_BODYREADYOBSERVER = true
 SSR_HMR = true
 SSR_TRANSFERCACHE = true

package/env/.env.ssr.cabloyStartWeb

@@ -10,8 +10,7 @@ LAYOUT_SIDEBAR_LEFTOPENPC = false
 
 STYLE_DEFAULT_THEME = home-theme:orange
 
-SSR_COOKIE_LOCALE = false
-SSR_COOKIE_THEME = false
+SSR_COOKIE = false
 SSR_BODYREADYOBSERVER = false
 SSR_HMR = true
 SSR_TRANSFERCACHE = true

package/env/.env.ssr.web

@@ -1,7 +1,6 @@
 LAYOUT_SIDEBAR_LEFTOPENPC = false
 
-SSR_COOKIE_LOCALE = false
-SSR_COOKIE_THEME = false
+SSR_COOKIE = false
 SSR_BODYREADYOBSERVER = false
 SSR_TRANSFERCACHE = true
 SSR_TRANSFERCACHE_EXPIRES = 10m

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zova-ui-vuetify",
-  "version": "5.1.49",
-  "gitHead": "82c92728dc676e15858935260b08b54ccf5d2513",
+  "version": "5.1.50",
+  "gitHead": "db6bc97f066c74a29176f652bd79c25d391ad483",
   "description": "A vue3 vuetify framework with ioc",
   "keywords": [
     "ioc",
@@ -60,7 +60,7 @@
     "@cabloy/json5": "^1.1.4",
     "@cabloy/logger": "^1.1.9",
     "@cabloy/module-info": "^2.0.0",
-    "@cabloy/utils": "^2.1.5",
+    "@cabloy/utils": "^2.1.6",
     "@cabloy/vue-router": "^4.4.16",
     "@cabloy/word-utils": "^2.1.8",
     "@cabloy/zod-openapi": "^1.1.5",
@@ -88,8 +88,8 @@
     "vue-router": "npm:@cabloy/vue-router@^4.4.16",
     "vuetify": "^4.0.5",
     "zod": "^4.3.6",
-    "zova": "^5.1.31",
-    "zova-jsx": "^1.1.16",
+    "zova": "^5.1.32",
+    "zova-jsx": "^1.1.17",
     "zova-module-a-action": "^5.1.11",
     "zova-module-a-actions": "^5.1.9",
     "zova-module-a-api": "^5.1.8",
@@ -103,22 +103,22 @@
     "zova-module-a-fetch": "^5.1.8",
     "zova-module-a-form": "^5.1.9",
     "zova-module-a-icon": "^5.1.11",
-    "zova-module-a-interceptor": "^5.1.10",
+    "zova-module-a-interceptor": "^5.1.11",
     "zova-module-a-logger": "^5.1.9",
     "zova-module-a-meta": "^5.1.8",
-    "zova-module-a-model": "^5.1.9",
+    "zova-module-a-model": "^5.1.10",
     "zova-module-a-openapi": "^5.1.9",
     "zova-module-a-pinia": "^5.1.8",
     "zova-module-a-router": "^5.1.11",
     "zova-module-a-routerstack": "^5.1.9",
     "zova-module-a-routertabs": "^5.1.12",
-    "zova-module-a-ssr": "^5.1.9",
+    "zova-module-a-ssr": "^5.1.10",
     "zova-module-a-ssrhmr": "^5.1.8",
     "zova-module-a-ssrserver": "^5.1.8",
-    "zova-module-a-style": "^5.1.9",
+    "zova-module-a-style": "^5.1.10",
     "zova-module-a-table": "^5.1.9",
     "zova-module-a-zod": "^5.1.11",
-    "zova-module-a-zova": "^5.1.20",
+    "zova-module-a-zova": "^5.1.21",
     "zova-module-demo-basic": "workspace:^",
     "zova-module-home-api": "workspace:^",
     "zova-module-home-base": "workspace:^",
@@ -136,7 +136,7 @@
     "zova-suite-a-cabloy": "^5.1.11"
   },
   "devDependencies": {
-    "@cabloy/cli": "^3.1.7",
+    "@cabloy/cli": "^3.1.8",
     "@cabloy/lint": "^5.1.7",
     "@cabloy/openapi-typescript": "^7.9.2",
     "@quasar/app-vite": "npm:@cabloy/quasar-app-vite@^2.5.9",
@@ -149,7 +149,7 @@
     "less": "^4.6.4",
     "oxfmt": "^0.45.0",
     "oxlint": "^1.60.0",
-    "quasar-app-extension-zova": "^1.2.17",
+    "quasar-app-extension-zova": "^1.2.18",
     "sass-embedded": "^1.99.0",
     "typescript": "^5.9.3",
     "unplugin-fonts": "^1.4.0",
@@ -158,7 +158,7 @@
     "vite-plugin-vuetify": "^2.1.3",
     "vue-tsc": "^3.2.6",
     "zova-openapi": "^1.1.8",
-    "zova-vite": "^1.1.17"
+    "zova-vite": "^1.1.18"
   },
   "packageManager": "pnpm@10.19.0",
   "pnpm": {

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

@@ -32,6 +32,11 @@ export default function (sys: ZovaSys) {
     jwt: env.API_JWT !== 'false',
   };
 
+  // ssr
+  config.ssr = {
+    cookie: sys.env.SSR_COOKIE === 'true',
+  };
+
   // ws
   config.ws = {
     baseURL: config.api.baseURL?.replace('https://', 'wss://').replace('http://', 'ws://'),
@@ -41,7 +46,6 @@ export default function (sys: ZovaSys) {
   // locale
   config.locale = {
     default: env.APP_LOCALE_DEFAULT as keyof ILocaleRecord,
-    cookieLocale: sys.env.SSR_COOKIE_LOCALE === 'true',
     storeKey: 'locale',
     items: {
       'en-us': 'LanguageEnglish',

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

@@ -1,8 +1,7 @@
+import { checkErrorJwtExpired } from '@cabloy/utils';
 import { BeanBase } from 'zova';
 import { Service } from 'zova-module-a-bean';
 
-export const ErrorMessageJwtExpired = 'jwt expired';
-
 @Service()
 export class ServiceSsr extends BeanBase {
   public async initialize() {
@@ -21,7 +20,7 @@ export class ServiceSsr extends BeanBase {
     if (!process.env.SERVER) return;
     const _eventErrorHandler = this.app.meta.event.on('app:errorHandler', ({ err }, next) => {
       if (err.code === 401) {
-        if (err.message === ErrorMessageJwtExpired) {
+        if (checkErrorJwtExpired(err)) {
           try {
             this.app.$gotoPage('/home/base/errorExpired', { returnTo: true });
           } catch (err: any) {