@dargmuesli/nuxt-vio 3.4.0 → 3.5.1

package/composables/useAppLayout.ts

@@ -2,7 +2,8 @@ export const useAppLayout = () => {
   const appConfig = useAppConfig()
   const siteConfig = useSiteConfig()
 
-  useServerHeadSafe({
+  // TODO: replace with `useServerHeadSafe`
+  useHeadSafe({
     ...useLocaleHead({ addSeoAttributes: true }).value,
     bodyAttrs: {
       class:
@@ -11,7 +12,7 @@ export const useAppLayout = () => {
   })
 
   // TODO: convert to `useServerHeadSafe` (https://github.com/harlan-zw/nuxt-seo-kit/issues/98)
-  useServerSeoMeta({
+  useSeoMeta({
     titleTemplate: (title) =>
       title && title !== siteConfig.name
         ? `${title} ${siteConfig.titleSeparator} ${siteConfig.name}`
@@ -19,11 +20,13 @@ export const useAppLayout = () => {
   })
 
   if (appConfig.vio.seoMeta) {
-    useServerSeoMeta(appConfig.vio.seoMeta)
+    // TODO: replace with `useServerSeoMeta`
+    useSeoMeta(appConfig.vio.seoMeta)
   }
 
   if (appConfig.vio.themeColor) {
-    useServerSeoMeta({
+    // TODO: replace with `useServerSeoMeta`
+    useSeoMeta({
       msapplicationTileColor: appConfig.vio.themeColor,
       themeColor: appConfig.vio.themeColor,
     })

package/composables/useDateTime.ts

@@ -1,11 +1,10 @@
 import { Dayjs } from 'dayjs'
 
 export const useDateTime = () => {
-  const event = useRequestEvent()
-  const { $dayjs } = useNuxtApp()
+  const { $dayjs, ssrContext } = useNuxtApp()
   const timezoneCookie = useCookie(TIMEZONE_COOKIE_NAME)
 
-  const timezoneHeader = event?.node.req.headers[TIMEZONE_HEADER_KEY]
+  const timezoneHeader = ssrContext?.event.node.req.headers[TIMEZONE_HEADER_KEY]
   const timezone =
     timezoneHeader && !Array.isArray(timezoneHeader)
       ? timezoneHeader

package/composables/useFavicons.ts

@@ -1,7 +1,8 @@
 export const useFavicons = () => {
   const appConfig = useAppConfig()
 
-  useServerHeadSafe({
+  // TODO: replace with `useServerHeadSafe`
+  useHeadSafe({
     link: [
       {
         href: `/assets/static/favicon/site.webmanifest?v=${CACHE_VERSION}`,

package/composables/useHeadDefault.ts

@@ -17,5 +17,5 @@ export const useHeadDefault = ({
     twitterTitle: title,
   }
 
-  useServerSeoMeta(defu(extension, defaults))
+  useSeoMeta(defu(extension, defaults)) // TODO: replace with `useServerSeoMeta`
 }

package/composables/useHost.ts

@@ -1,8 +1,8 @@
 export const useHost = () => {
-  if (process.server) {
-    const event = useRequestEvent()
+  const { ssrContext } = useNuxtApp()
 
-    return getHost(event.node.req)
+  if (ssrContext) {
+    return getHost(ssrContext.event)
   } else {
     return location.host
   }

package/composables/usePolyfills.ts

@@ -1,8 +1,12 @@
+import { POLYFILLS } from '../utils/constants'
+
 export const usePolyfills = () => {
-  const polyfills =
-    'https://polyfill.io/v3/polyfill.min.js?features=Promise&flags=gated'
+  const polyfills = `https://polyfill.io/v3/polyfill.min.js?features=${POLYFILLS.join(
+    '%2C',
+  )}&flags=gated`
 
-  useServerHead({
+  // TODO: replace with `useServerHead`
+  useHead({
     link: [
       {
         rel: 'preload',

package/error.vue

@@ -20,7 +20,9 @@ const errorProp = toRef(() => props.error)
 
 // initialization
 useAppLayout()
-useServerHeadSafe({
+
+// TODO: replace with `useServerHeadSafe`
+useHeadSafe({
   title: `${errorProp.value.statusCode} - ${errorProp.value.message}`,
 })
 </script>

package/nuxt.config.ts

@@ -6,6 +6,7 @@ import { defu } from 'defu'
 import {
   BASE_URL,
   I18N_COOKIE_NAME,
+  I18N_MODULE_CONFIG,
   SITE_NAME,
   TIMEZONE_COOKIE_NAME,
   VIO_NUXT_BASE_CONFIG,
@@ -160,7 +161,10 @@ export default defineNuxtConfig(
         titleSeparator: '·',
       },
       sitemap: {
-        exclude: ['/api/pages/**'],
+        exclude: I18N_MODULE_CONFIG.locales.map(
+          (locale) =>
+            `/${locale.code !== 'en' ? `${locale.code}/` : ''}api/pages/**`,
+        ),
       },
       tailwindcss: {
         cssPath: join(currentDir, './assets/css/tailwind.css'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-vio",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -41,16 +41,16 @@
     "prepare": "nuxt prepare .playground",
     "preview": "nuxt preview .playground",
     "start": "PORT=3001 node .playground/.output/server/index.mjs",
-    "test:e2e": "playwright test",
-    "test:e2e:dev": "cross-env NUXT_PUBLIC_IS_TESTING=1 WAIT_ON_TIMEOUT=100000 pnpm test:e2e",
-    "test:e2e:prod": "cross-env NUXT_PUBLIC_IS_TESTING=1 WAIT_ON_TIMEOUT=10000 NODE_ENV=production pnpm test:e2e",
-    "test:e2e:docker:build": "docker build -t test-e2e_base --build-arg UID=$(id -u) --build-arg GID=$(id -g) --target test-e2e_base ..",
-    "test:e2e:docker:run": "docker run --rm -v \"$PWD/..:/srv/app\" -v \"$(pnpm store path):/srv/.pnpm-store\" test-e2e_base",
+    "test:e2e:dev": "cross-env NUXT_PUBLIC_IS_TESTING=1 pnpm test:e2e",
     "test:e2e:docker:br": "pnpm test:e2e:docker:build && pnpm test:e2e:docker:run",
-    "test:e2e:docker:dev": "pnpm test:e2e:docker:br pnpm --dir src run test:e2e:dev",
+    "test:e2e:docker:build": "docker build -t test-e2e_base --build-arg UID=$(id -u) --build-arg GID=$(id -g) --target test-e2e_base ..",
     "test:e2e:docker:dev:update": "pnpm test:e2e:docker:dev --update-snapshots",
+    "test:e2e:docker:dev": "pnpm test:e2e:docker:br pnpm --dir src run test:e2e:dev",
+    "test:e2e:docker:prod:update": "pnpm test:e2e:docker:prod --update-snapshots",
     "test:e2e:docker:prod": "pnpm test:e2e:docker:br pnpm --dir src run test:e2e:prod",
-    "test:e2e:docker:prod:update": "pnpm test:e2e:docker:prod --update-snapshots"
+    "test:e2e:docker:run": "docker run --rm -v \"$PWD/..:/srv/app\" -v \"$(pnpm store path):/srv/.pnpm-store\" test-e2e_base",
+    "test:e2e:prod": "cross-env NUXT_PUBLIC_IS_TESTING=1 NODE_ENV=production pnpm test:e2e",
+    "test:e2e": "playwright test"
   },
   "dependencies": {
     "@axe-core/playwright": "4.7.3",
@@ -61,7 +61,7 @@
     "@nuxtjs/html-validator": "1.5.2",
     "@nuxtjs/i18n": "8.0.0-rc.4",
     "@nuxtjs/tailwindcss": "6.8.0",
-    "@nuxtseo/module": "2.0.0-beta.25",
+    "@nuxtseo/module": "2.0.0-beta.26",
     "@pinia/nuxt": "0.4.11",
     "@playwright/test": "1.37.1",
     "@tailwindcss/forms": "0.5.6",
@@ -78,12 +78,13 @@
     "cookie": "0.5.0",
     "dayjs": "2.0.0-alpha.4",
     "is-https": "4.0.0",
+    "jiti": "1.19.3",
     "jose": "4.14.6",
     "lodash-es": "4.17.21",
     "pinia": "2.1.6",
     "sweetalert2": "11.7.27",
     "vue-gtag": "2.0.1",
-    "vue-tsc": "1.8.8"
+    "vue-tsc": "1.8.10"
   },
   "devDependencies": {
     "@intlify/eslint-plugin-vue-i18n": "3.0.0-next.3",

package/utils/auth.ts

@@ -69,9 +69,8 @@ export const jwtStore = async ({
 }
 
 export const useJwtStore = () => {
-  const { $urqlReset } = useNuxtApp()
+  const { $urqlReset, ssrContext } = useNuxtApp()
   const store = useVioAuthStore()
-  const event = useRequestEvent()
 
   if (typeof $urqlReset !== 'function')
     throw new Error('`$urqlReset` is not a function!')
@@ -81,7 +80,7 @@ export const useJwtStore = () => {
       await jwtStore({
         $urqlReset,
         store,
-        res: process.server ? event.node.res : undefined,
+        res: ssrContext ? ssrContext.event.node.res : undefined,
         jwt,
       })
     },
@@ -99,9 +98,8 @@ export const signOut = async ({
 }) => await jwtStore({ $urqlReset, store, res })
 
 export const useSignOut = () => {
-  const { $urqlReset } = useNuxtApp()
+  const { $urqlReset, ssrContext } = useNuxtApp()
   const store = useVioAuthStore()
-  const event = useRequestEvent()
 
   if (typeof $urqlReset !== 'function')
     throw new Error('`$urqlReset` is not a function!')
@@ -111,7 +109,7 @@ export const useSignOut = () => {
       await signOut({
         $urqlReset,
         store,
-        res: process.server ? event.node.res : undefined,
+        res: ssrContext ? ssrContext.event.node.res : undefined,
       })
     },
   }

package/utils/constants.ts

@@ -40,6 +40,7 @@ export const I18N_VUE_CONFIG = {
 }
 export const JWT_NAME = () =>
   `${process.env.NODE_ENV === 'production' ? '__Secure-' : ''}jwt`
+export const POLYFILLS = ['Promise']
 export const REGEX_UUID =
   /^[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$/
 export const TIMEZONE_COOKIE_NAME = [COOKIE_PREFIX, 'tz'].join(COOKIE_SEPARATOR)

package/utils/networking.ts

@@ -1,5 +1,3 @@
-import { IncomingMessage } from 'node:http'
-
 import { CombinedError } from '@urql/core'
 import { H3Event, getCookie } from 'h3'
 
@@ -79,10 +77,12 @@ export const getDomainTldPort = (host: string) => {
   return `${hostParts[hostParts.length - 2]}.${hostParts[hostParts.length - 1]}`
 }
 
-export const getHost = (req: IncomingMessage) => {
-  if (!req.headers.host) throw new Error('Host header is not given!')
+export const getHost = (event: H3Event) => {
+  const host = event.node.req.headers.host
+
+  if (!host) throw new Error('Host header is not given!')
 
-  return req.headers.host
+  return host
 }
 
 export const getServiceHref = ({