@live-change/peer-connection-frontend 0.2.51 → 0.2.53

package/front/src/App.vue

@@ -37,10 +37,11 @@ import 'primeicons/primeicons.css'
 
 import ProgressSpinner from 'primevue/progressspinner'
 
-import { useMeta } from 'vue-meta'
 import Page from "./Page.vue"
 
-const { meta } = useMeta({
+import { computed } from 'vue'
+import { useHead } from '@vueuse/head'
+useHead(computed(() => ({
   title: 'Title',
   meta: [
     { charset: 'utf-8' },
@@ -52,7 +53,7 @@ const { meta } = useMeta({
     lang: 'en',
     amp: true
   }
-})
+})))
 
 import { ref } from 'vue'
 const working = ref(false)

package/front/src/entry-server.js

@@ -1,59 +1,6 @@
-import { renderToString } from 'vue/server-renderer'
-import { renderMetaToString } from 'vue-meta/ssr'
+import { serverEntry } from '@live-change/frontend-base/server-entry.js'
+import App from './App.vue'
+import { createRouter } from './router'
 
-import { serverApi } from '@live-change/vue3-ssr/serverApi.js'
-
-import { createApp } from './main'
-
-function escapeHtml(unsafe) {
-  return unsafe
-      .replace(/&/g, "&")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;")
-      .replace(/"/g, "&quot;")
-      .replace(/'/g, "&#039;");
-}
-
-export async function render({ url, dao, windowId }) {
-  const api = await serverApi(dao, {
-    use: [ ]
-  })
-
-  const { app, router } = createApp(api)
-
-  // set the router to the desired URL before rendering
-  router.push(url)
-  await router.isReady()
-
-  // prefetch data
-  await 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)
-  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 }
-}
+const render = serverEntry(App, createRouter, {})
+export { render }

package/front/vite.config.js

@@ -71,7 +71,6 @@ export default defineConfig(async ({ command, mode }) => {
         'vite'
       ],
       noExternal: [
-        'vue-meta',
         '@live-change/vue3-components',
         '@live-change/dao-vue3',
         '@live-change/vue3-ssr',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/peer-connection-frontend",
-  "version": "0.2.51",
+  "version": "0.2.53",
   "scripts": {
     "memDev": "lcli memDev --enableSessions --initScript ./init.js",
     "localDevInit": "rm tmp.db; lcli localDev --enableSessions --initScript ./init.js",
@@ -20,48 +20,47 @@
     "debug": "node --inspect-brk server"
   },
   "dependencies": {
-    "@live-change/cli": "0.7.28",
+    "@live-change/cli": "0.7.30",
     "@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.28",
-    "@live-change/password-authentication-service": "0.3.28",
-    "@live-change/secret-code-service": "0.3.28",
-    "@live-change/secret-link-service": "0.3.28",
-    "@live-change/session-service": "0.3.28",
-    "@live-change/user-frontend": "^0.2.51",
-    "@live-change/user-service": "0.3.28",
+    "@live-change/framework": "0.7.30",
+    "@live-change/password-authentication-service": "0.3.29",
+    "@live-change/secret-code-service": "0.3.29",
+    "@live-change/secret-link-service": "0.3.29",
+    "@live-change/session-service": "0.3.29",
+    "@live-change/user-frontend": "^0.2.53",
+    "@live-change/user-service": "0.3.29",
     "@live-change/vue3-components": "0.2.28",
     "@live-change/vue3-ssr": "0.2.28",
-    "@vueuse/core": "^9.1.0",
+    "@vueuse/core": "^10.4.1",
     "codeceptjs-assert": "^0.0.5",
     "compression": "^1.7.4",
     "cross-env": "^7.0.3",
     "get-port-sync": "1.0.1",
-    "primeflex": "^3.3.0",
+    "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",
-    "primevue": "^3.28.0",
+    "primevue": "^3.34.1",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-visualizer": "5.6.0",
-    "serialize-javascript": "^6.0.0",
+    "rollup-plugin-visualizer": "5.9.2",
+    "serialize-javascript": "^6.0.1",
     "serve-static": "^1.15.0",
-    "v-shared-element": "3.1.0",
-    "vue-meta": "^3.0.0-alpha.9",
-    "vue-router": "^4.1.3",
+    "v-shared-element": "3.1.1",
+    "vue-router": "^4.2.4",
     "vue3-scroll-border": "0.1.5"
   },
   "devDependencies": {
-    "@live-change/codeceptjs-helper": "0.7.28",
-    "@wdio/selenium-standalone-service": "^7.20.8",
-    "codeceptjs": "^3.3.4",
+    "@live-change/codeceptjs-helper": "0.7.30",
+    "@wdio/selenium-standalone-service": "^8.15.0",
+    "codeceptjs": "^3.5.4",
     "generate-password": "1.7.0",
-    "playwright": "^1.24.2",
+    "playwright": "^1.37.1",
     "random-profile-generator": "^2.3.0",
-    "txtgen": "^3.0.2",
-    "webdriverio": "^7.20.9"
+    "txtgen": "^3.0.6",
+    "webdriverio": "^8.16.6"
   },
   "author": "",
   "license": "BSD-3-Clause",
   "description": "",
-  "gitHead": "0fd9d72bb8a5fd8402244756d5ff023028dfcb6d"
+  "gitHead": "55ef49d734bc2bd983010f862648e16aaf680d9f"
 }

package/front/src/main.js

@@ -1,60 +0,0 @@
-import { createSSRApp } from 'vue'
-import { createMetaManager } from 'vue-meta'
-
-import { registerComponents } from '@live-change/vue3-components'
-import ReactiveDaoVue from '@live-change/dao-vue3'
-
-import PrimeVue from 'primevue/config'
-import ConfirmationService from 'primevue/confirmationservice'
-import { PrimeVueConfirmSymbol } from 'primevue/useconfirm'
-import { PrimeVueToastSymbol } from 'primevue/usetoast'
-import ToastService from 'primevue/toastservice'
-import StyleClass from 'primevue/styleclass'
-import Ripple from 'primevue/ripple'
-import BadgeDirective from 'primevue/badgedirective'
-
-import App from './App.vue'
-import { createRouter } from './router'
-
-import emailValidator from "@live-change/email-service/clientEmailValidator.js"
-import passwordValidator from "@live-change/password-authentication-service/clientPasswordValidator.js"
-
-// SSR requires a fresh app instance per request, therefore we export a function
-// that creates a fresh app instance. If using Vuex, we'd also be creating a
-// fresh store here.
-export function createApp(api) {
-  api.validators.email = emailValidator
-  api.validators.password = passwordValidator
-
-  const app = createSSRApp(App)
-  app.config.devtools = true
-
-  api.installInstanceProperties(app.config.globalProperties)
-
-  registerComponents(app)
-  app.use(ReactiveDaoVue, { dao: api })
-
-  const router = createRouter(app)
-  app.use(router)
-
-  app.use(PrimeVue, {
-    ripple: true
-  })
-
-  app.use(ConfirmationService)
-  app.provide(PrimeVueConfirmSymbol, app.config.globalProperties.$confirm)
-
-  app.use(ToastService)
-  app.provide(PrimeVueToastSymbol, app.config.globalProperties.$toast)
-
-  app.directive('styleclass', StyleClass)
-  app.directive('ripple', Ripple)
-  app.directive('badge', BadgeDirective)
-
-  const meta = createMetaManager({
-    isSSR: import.meta.env.SSR
-  })
-  app.use(meta)
-
-  return { app, router }
-}