@live-change/frontend-base 0.9.33 → 0.9.35

package/UpdateBanner.vue

@@ -5,11 +5,11 @@
     <div class="items-center hidden md:flex">
       <span class="leading-normal">{{ t("app.newVersions") }}</span>
     </div>
-    <a class="flex items-center ml-2 mr-20">
+    <div class="flex items-center ml-2 mr-20">
       <a class="text-gray-900" href="#" @click="update">
         <span class="underline font-bold">{{ t("app.reload") }}</span>
       </a>
-    </a>
+    </div>
     <a v-ripple class="flex align-items-center no-underline justify-content-center border-circle text-gray-900
          hover:bg-bluegray-700 cursor-pointer transition-colors transition-duration-150 p-ripple"
        style="width:2rem; height: 2rem" @click="hideUpdateBanner">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/frontend-base",
-  "version": "0.9.33",
+  "version": "0.9.35",
   "scripts": {
     "memDev": "node server/start.js memDev --enableSessions --initScript ./init.js --templatePath ../../base-frontend/index.html",
     "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
@@ -35,21 +35,21 @@
     "@lezer/rust": "=1.0.1",
     "@lezer/sass": "=1.0.3",
     "@lezer/xml": "=1.0.2",
-    "@live-change/cli": "^0.9.33",
-    "@live-change/dao": "^0.9.33",
-    "@live-change/dao-message": "^0.9.33",
-    "@live-change/dao-sockjs": "^0.9.33",
-    "@live-change/dao-vue3": "^0.9.33",
-    "@live-change/dao-websocket": "^0.9.33",
-    "@live-change/email-service": "^0.9.33",
-    "@live-change/password-authentication-service": "^0.9.33",
-    "@live-change/secret-code-service": "^0.9.33",
-    "@live-change/secret-link-service": "^0.9.33",
-    "@live-change/security-frontend": "^0.9.33",
-    "@live-change/session-service": "^0.9.33",
-    "@live-change/user-service": "^0.9.33",
-    "@live-change/vue3-components": "^0.9.33",
-    "@live-change/vue3-ssr": "^0.9.33",
+    "@live-change/cli": "^0.9.35",
+    "@live-change/dao": "^0.9.35",
+    "@live-change/dao-message": "^0.9.35",
+    "@live-change/dao-sockjs": "^0.9.35",
+    "@live-change/dao-vue3": "^0.9.35",
+    "@live-change/dao-websocket": "^0.9.35",
+    "@live-change/email-service": "^0.9.35",
+    "@live-change/password-authentication-service": "^0.9.35",
+    "@live-change/secret-code-service": "^0.9.35",
+    "@live-change/secret-link-service": "^0.9.35",
+    "@live-change/security-frontend": "^0.9.35",
+    "@live-change/session-service": "^0.9.35",
+    "@live-change/user-service": "^0.9.35",
+    "@live-change/vue3-components": "^0.9.35",
+    "@live-change/vue3-ssr": "^0.9.35",
     "@primevue/themes": "^4.2.5",
     "@tailwindcss/vite": "4.0.6",
     "@unhead/ssr": "^1.6.2",
@@ -105,7 +105,7 @@
     "vue3-scroll-border": "0.1.6"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "^0.9.33",
+    "@live-change/codeceptjs-helper": "^0.9.35",
     "codeceptjs": "^3.6.10",
     "generate-password": "1.7.1",
     "playwright": "1.49.1",
@@ -119,5 +119,5 @@
   "author": "Michał Łaszczewski <michal@laszczewski.pl>",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "c6eaa7764dc12b9489b74386b1227b71d0640e09"
+  "gitHead": "abe67aa58ccf8246b8b9fde832287b5305480b91"
 }

package/server-entry.js

@@ -6,6 +6,8 @@ import { createApp } from "./main.js"
 import { setTime } from "./time.js"
 
 import { renderHeadToString } from "@vueuse/head"
+import { Theme } from '@primeuix/styled'
+import { Base, BaseStyle } from '@primevue/core'
 
 function escapeHtml(unsafe) {
   return (''+unsafe)
@@ -51,25 +53,33 @@ export function serverEntry(App, createRouter, config = {}) {
       ...(config.prefetch ?? []).map(fn => fn(app, router, head)),
       api.preFetchRoute(router.currentRoute, router)
     ])
-    // passing SSR context object which will be available via useSSRContext()
-    // @vitejs/plugin-vue injects code into a component's setup() that registers
-    // itself on ctx.modules. After the render, ctx.modules would contain all the
-    // components that have been instantiated during this render call.
+
     const ctx = {}
-    const html = await renderToString(app, ctx)
 
+    let usedStyles = new Set()
+    Base.setLoadedStyleName = async (name) => usedStyles.add(name)
+
+    const html = await renderToString(app, ctx)
+    // get the prerender cache data
     const data = api.prerenderCache.cacheData()
 
-    // the SSR manifest generated by Vite contains module -> chunk/asset mapping
-    // which we can then use to determine what files need to be preloaded for this
-    // request.
+    const renderedHead = await renderHeadToString(head) 
 
-    const renderedHead = await renderHeadToString(head)
 
-/*    const html = 'html'
-    const renderedHead= 'head'
-    const data = {}
-    const ctx = { modules: [] }*/
+    const styleSheets = []
+    styleSheets.push(`<style type="text/css" data-primevue-style-id="layer-order">${
+      BaseStyle.getLayerOrderThemeCSS()}</style>`)
+    BaseStyle.getLayerOrderThemeCSS()
+
+    styleSheets.push(Theme.getCommonStyleSheet())
+    for(const name of usedStyles) {
+      styleSheets.push(Theme.getStyleSheet(name))
+      const styleObject = await import(/* @vite-ignore */`primevue/${name}/style`)
+      styleSheets.push(styleObject.default.getThemeStyleSheet())
+    }
+    styleSheets.push(BaseStyle.getThemeStyleSheet())
+
+    renderedHead.headTags += styleSheets.join('\n')
 
     return { html, data, meta: renderedHead, modules: ctx.modules, response }
   }