@dargmuesli/nuxt-vio 3.0.0-beta.4 → 3.0.0-beta.6

package/components/vio/form/VioForm.vue

@@ -43,7 +43,7 @@
 <script setup lang="ts">
 import type { BaseValidation } from '@vuelidate/core'
 
-import type { BackendError } from '~/../types/api'
+import type { BackendError } from '../../../types/api'
 
 export interface Props {
   errors?: BackendError[]

package/components/vio/form/input/VioFormInput.vue

@@ -53,7 +53,7 @@
             <VioFormInputIconWrapper v-if="validationProperty.$pending">
               <IconHourglass
                 class="text-blue-600"
-                :title="t('globalLoading')"
+                :title="t('globalStatusLoading')"
               />
             </VioFormInputIconWrapper>
             <VioFormInputIconWrapper
@@ -91,7 +91,7 @@
       <div class="md:w-2/3">
         <slot name="stateInfo" />
         <VioFormInputStateInfo v-if="value?.$pending">
-          {{ t('globalLoading') }}
+          {{ t('globalStatusLoading') }}
         </VioFormInputStateInfo>
       </div>
       <div class="md:w-1/3" />

package/components/vio/loader/indicator/VioLoaderIndicator.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="flex h-full items-center justify-center"
-    :title="t('globalLoading')"
+    :title="t('globalStatusLoading')"
   >
     <div class="flex items-center justify-center w-1/2">
       <slot />

package/components/vio/loader/indicator/VioLoaderIndicatorPing.vue

@@ -2,7 +2,7 @@
   <VioLoaderIndicator>
     <div
       class="w-1/2 aspect-square animate-ping rounded-full bg-gray-500"
-      :title="t('globalLoading')"
+      :title="t('globalStatusLoading')"
     />
   </VioLoaderIndicator>
 </template>

package/composables/useAppLayout.ts

@@ -18,6 +18,6 @@ export const useAppLayout = () => {
         ? `${titleChunk} ${siteConfig.titleSeparator} ${siteConfig.name}`
         : siteConfig.name
     },
-    ...appConfig.vio.seoMeta,
+    ...(appConfig.vio.seoMeta ? appConfig.vio.seoMeta : {}),
   })
 }

package/locales/de.json

@@ -1,5 +1,5 @@
 {
-  "globalLoading": "Lade...",
+  "globalStatusLoading": "Lade...",
   "globalPlaceholderUrl": "https://websei.te",
   "globalStatusError": "Fehler",
   "globalValidationFailed": "Bitte überprüfe deine Eingaben 🙈",

package/locales/en.json

@@ -1,5 +1,5 @@
 {
-  "globalLoading": "Loading...",
+  "globalStatusLoading": "Loading...",
   "globalPlaceholderUrl": "https://websi.te",
   "globalStatusError": "Error",
   "globalValidationFailed": "Please check your input 🙈",

package/nuxt.config.ts

@@ -164,7 +164,7 @@ export default defineNuxtConfig({
     url: BASE_URL,
   },
   sitemap: {
-    exclude: ['/api/**'],
+    exclude: ['/api/pages/**'],
   },
   tailwindcss: {
     cssPath: join(currentDir, './assets/css/tailwind.css'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dargmuesli/nuxt-vio",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.6",
   "type": "module",
   "publishConfig": {
     "access": "public"

package/plugins/dayjs.ts

@@ -1,4 +1,5 @@
-import dayjs, { extend, locale } from 'dayjs'
+/* eslint-disable import/no-named-as-default-member */
+import dayjs from 'dayjs'
 
 // workaround for [1]
 import de from 'dayjs/locale/de'
@@ -10,13 +11,13 @@ import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'
 
 export default defineNuxtPlugin((_nuxtApp) => {
-  extend(isSameOrBefore)
-  extend(localizedFormat)
-  extend(timezone)
-  extend(utc)
+  dayjs.extend(isSameOrBefore)
+  dayjs.extend(localizedFormat)
+  dayjs.extend(timezone)
+  dayjs.extend(utc)
 
   // workaround for [1]
-  locale(de)
+  dayjs.locale(de)
   // dayjs.locale(en) makes `format` error
 
   return {

package/types/api.d.ts

@@ -1,7 +1,9 @@
-export type BackendError = CombinedError | { errcode: string; message: string }
+import type { CombinedError } from '@urql/core'
 
 export type ApiData = ComputedRef<{
   data?: Object
   errors: BackendError[]
   isFetching: boolean
 }>
+
+export type BackendError = CombinedError | { errcode: string; message: string }

package/utils/networking.ts

@@ -106,10 +106,22 @@ export const getServiceHref = ({
   }
 }
 
-export const getTimezone = async (event: H3Event) =>
-  getCookie(event, TIMEZONE_COOKIE_NAME) ||
-  (
-    await ofetch(
+export const getTimezone = async (event: H3Event) => {
+  const timezoneCookie = getCookie(event, TIMEZONE_COOKIE_NAME)
+
+  if (timezoneCookie) {
+    return timezoneCookie
+  }
+
+  if (event.node.req.headers['x-real-ip']) {
+    const ipApiResult = await ofetch(
       `http://ip-api.com/json/${event.node.req.headers['x-real-ip']}`,
-    )
-  ).timezone
+    ).catch(() => {})
+
+    if (ipApiResult) {
+      return ipApiResult.timezone
+    }
+  }
+
+  return undefined
+}