@live-change/db-admin 0.6.15 → 0.6.16

package/front/src/App.vue

@@ -42,11 +42,12 @@
 
   import ProgressSpinner from 'primevue/progressspinner'
 
-  import { useMeta } from 'vue-meta'
   import Page from "./Page.vue"
 
-  const { meta } = useMeta({
-    title: 'Title',
+  import { computed } from 'vue'
+  import { useHead } from '@vueuse/head'
+  useHead(computed(() => ({
+    title: 'DB Admin',
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport',
@@ -57,7 +58,7 @@
       lang: 'en',
       amp: true
     }
-  })
+  })))
 
   import { onMounted } from 'vue'
   import isClientSide from "./isClientSide.js"

package/front/src/entry-server.js

@@ -1,5 +1,6 @@
 import { renderToString } from 'vue/server-renderer'
-import { renderMetaToString } from 'vue-meta/ssr'
+
+import { renderHeadToString } from "@vueuse/head"
 
 import { serverApi } from '@live-change/vue3-ssr/serverApi.js'
 
@@ -34,26 +35,13 @@ export async function render({ url, dao, windowId }) {
   // components that have been instantiated during this render call.
   const ctx = {}
   const html = await renderToString(app, ctx)
-  await renderMetaToString(app, ctx)
+
 
   const data = api.prerenderCache.cacheData()
-  console.log("PRERENDER CACHE", Array.from(api.prerenderCache.cache.keys()))
-  console.log("PRERENDER CACHE EXTENDED", Array.from(api.prerenderCache.extendedCache.keys()))
-
-  // 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 metaManager = app.config.globalProperties.$metaManager
-  const activeMeta = metaManager.target.context.active
-  console.log("ACTIVE META", activeMeta)
-  console.log("TELEPORTS", ctx.teleports)
-  ctx.teleports.head = [
-    ...(activeMeta.title ? [`<title data-vm-ssr="true">${escapeHtml(activeMeta.title)}</title>`] : []),
-    ...((activeMeta.meta || []).map(meta => `<meta ${Object.keys(meta).map(
-        key => `${escapeHtml(key)}="${escapeHtml(meta[key])}"`
-    ).join(' ')}>`))
-  ].join('\n')
-
-  return { html, data, meta: ctx.teleports, modules: ctx.modules }
+  //console.log("PRERENDER CACHE", Array.from(api.prerenderCache.cache.keys()))
+  //console.log("PRERENDER CACHE EXTENDED", Array.from(api.prerenderCache.extendedCache.keys()))
+
+  const renderedHead = await renderHeadToString(head)
+
+  return { html, data, meta: renderedHead, modules: ctx.modules }
 }

package/front/vite.config.js

@@ -14,6 +14,7 @@ const ssrTransformCustomDir = () => {
 }
 
 export default defineConfig(async ({ command, mode }) => {
+  console.log("VITE CONFIG", command, mode)
   return {
     define: {
       ENV_BASE_HREF: JSON.stringify(process.env.BASE_HREF || 'http://localhost:8001')
@@ -68,7 +69,10 @@ export default defineConfig(async ({ command, mode }) => {
     },
     ssr: {
       external: [
-        '@live-change/dao',
+        ...(command == 'build' ? [
+        ]: [
+          '@live-change/dao'
+        ]),
         '@live-change/uid',
         '@live-change/framework',
         '@live-change/framework/lib/utils/validators.js',
@@ -76,11 +80,18 @@ export default defineConfig(async ({ command, mode }) => {
         'vite'
       ],
       noExternal: [
-        'vue-meta',
+        ...(command == 'build' ? [
+          '@live-change/dao',
+        ]: [
+        ]),
         '@live-change/vue3-components',
         '@live-change/dao-vue3',
         '@live-change/vue3-ssr',
-        'vue3-scroll-border'
+        'vue3-scroll-border',
+        'primevue',
+        'primevue/usetoast',
+        'primevue/useconfirm',
+        'primevue/usedialog'
       ]
     },
     optimizeDeps: {
@@ -92,7 +103,11 @@ export default defineConfig(async ({ command, mode }) => {
         '@live-change/uid',
         '@live-change/framework',
         '@live-change/framework/lib/utils/validators.js',
-        'debug'
+        'debug',
+        'primevue',
+        'primevue/usetoast',
+        'primevue/useconfirm',
+        'primevue/usedialog'
       ]
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/db-admin",
-  "version": "0.6.15",
+  "version": "0.6.16",
   "scripts": {
     "memDev": "lcli memDev --initScript ./init.js --dbAccess",
     "localDevInit": "rm tmp.db; lcli localDev --initScript ./init.js --dbAccess",
@@ -17,11 +17,11 @@
     "debug": "node --inspect-brk server"
   },
   "dependencies": {
-    "@live-change/cli": "0.7.29",
+    "@live-change/cli": "0.7.31",
     "@live-change/dao": "0.5.20",
     "@live-change/dao-vue3": "0.5.20",
     "@live-change/dao-websocket": "0.5.20",
-    "@live-change/framework": "0.7.29",
+    "@live-change/framework": "0.7.31",
     "@live-change/vue3-components": "0.2.28",
     "@live-change/vue3-ssr": "0.2.28",
     "@vitejs/plugin-vue": "^4.3.4",
@@ -42,13 +42,12 @@
     "serve-static": "^1.15.0",
     "v-shared-element": "3.1.1",
     "vue": "^3.2.47",
-    "vue-meta": "^3.0.0-alpha.9",
     "vue-prism-editor": "2.0.0-alpha.2",
     "vue-router": "^4.2.4",
     "vue3-scroll-border": "0.1.5"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "0.7.29",
+    "@live-change/codeceptjs-helper": "0.7.31",
     "@wdio/selenium-standalone-service": "^8.15.0",
     "codeceptjs": "^3.5.4",
     "generate-password": "1.7.0",
@@ -60,5 +59,5 @@
   "author": "",
   "license": "ISC",
   "description": "",
-  "gitHead": "5d190c95dbd683b768511606e06f0e44783c40ad"
+  "gitHead": "94139feb257c24aa24e80ac85c4490a1c87665ed"
 }