@dargmuesli/nuxt-vio 3.0.0-beta.5 → 3.0.0-beta.7

package/app.config.ts

@@ -34,7 +34,6 @@ export default defineAppConfig({
         },
       },
     },
-    stagingHost: undefined,
     themeColor: undefined,
   },
 })
@@ -95,7 +94,6 @@ declare module 'nuxt/schema' {
           }
         }
       }
-      stagingHost?: string
       themeColor?: string
     }
   }

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/useGetServiceHref.ts

@@ -1,6 +1,6 @@
 export const useGetServiceHref = () => {
   const host = useHost()
-  const appConfig = useAppConfig()
+  const runtimeConfig = useRuntimeConfig()
 
   return ({
     isSsr = true,
@@ -16,6 +16,6 @@ export const useGetServiceHref = () => {
       isSsr,
       name,
       port,
-      stagingHost: appConfig.vio.stagingHost,
+      stagingHost: runtimeConfig.public.stagingHost,
     })
 }

package/locales/de.json

@@ -1,7 +1,7 @@
 {
-  "globalLoading": "Lade...",
   "globalPlaceholderUrl": "https://websei.te",
   "globalStatusError": "Fehler",
+  "globalStatusLoading": "Lade...",
   "globalValidationFailed": "Bitte überprüfe deine Eingaben 🙈",
   "globalValidationFormatUrlHttps": "Muss mit \"https://\" beginnen",
   "globalValidationLength": "Zu lang",

package/locales/en.json

@@ -1,7 +1,7 @@
 {
-  "globalLoading": "Loading...",
   "globalPlaceholderUrl": "https://websi.te",
   "globalStatusError": "Error",
+  "globalStatusLoading": "Loading...",
   "globalValidationFailed": "Please check your input 🙈",
   "globalValidationFormatUrlHttps": "Must start with \"https://\"",
   "globalValidationLength": "Too long",

package/nuxt.config.ts

@@ -65,6 +65,11 @@ export default defineNuxtConfig({
       },
       isInProduction: process.env.NODE_ENV === 'production',
       isTesting: false,
+      stagingHost:
+        process.env.NODE_ENV !== 'production' &&
+        !process.env.NUXT_PUBLIC_STACK_DOMAIN
+          ? 'localhost:3000'
+          : undefined,
     },
   },
   typescript: {
@@ -164,7 +169,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.5",
+  "version": "3.0.0-beta.7",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -29,17 +29,17 @@
   ],
   "main": "nuxt.config.ts",
   "scripts": {
-    "dev": "nuxi dev .playground",
-    "build": "nuxi build .playground",
-    "generate": "nuxi generate .playground",
-    "preview": "nuxi preview .playground",
-    "prepare": "nuxi prepare .playground",
-    "lint": "pnpm lint:js && pnpm lint:ts && pnpm lint:style",
+    "build": "nuxt build .playground",
+    "dev": "nuxt dev .playground",
+    "generate": "nuxt generate .playground",
     "lint:fix": "pnpm lint:js --fix && pnpm lint:ts --fix && pnpm lint:style --fix",
     "lint:js": "eslint --cache --ext .js,.ts,.vue --ignore-path .gitignore .",
     "lint:staged": "lint-staged",
     "lint:style": "stylelint **/*.{vue,css} --ignore-path .gitignore",
-    "lint:ts": "nuxi typecheck"
+    "lint:ts": "nuxt typecheck",
+    "lint": "pnpm lint:js && pnpm lint:ts && pnpm lint:style",
+    "prepare": "nuxt prepare .playground",
+    "preview": "nuxt preview .playground"
   },
   "dependencies": {
     "@dargmuesli/nuxt-cookie-control": "6.1.5",
@@ -57,8 +57,9 @@
     "@urql/exchange-graphcache": "6.3.1",
     "@urql/vue": "1.1.2",
     "@vuelidate/core": "2.0.3",
+    "@vuelidate/validators": "2.0.3",
     "clipboard": "2.0.11",
-    "dayjs": "1.11.9",
+    "dayjs": "2.0.0-alpha.4",
     "is-https": "4.0.0",
     "jose": "4.14.4",
     "marked": "7.0.1",
@@ -85,7 +86,6 @@
     "stylelint-config-standard": "34.0.0",
     "stylelint-no-unsupported-browser-features": "7.0.0",
     "tailwindcss": "3.3.3",
-    "typescript": "5.1.6",
     "vue": "3.3.4",
     "vue-tsc": "1.8.8"
   }

package/plugins/dayjs.ts

@@ -1,4 +1,3 @@
-/* eslint-disable import/no-named-as-default-member */
 import dayjs from 'dayjs'
 
 // workaround for [1]

package/server/middleware/headers.ts

@@ -6,7 +6,11 @@ import { TIMEZONE_HEADER_KEY } from '../../utils/constants'
 import { getTimezone } from '../../utils/networking'
 
 export default defineEventHandler(async (event) => {
-  setRequestHeader(event, TIMEZONE_HEADER_KEY, await getTimezone(event))
+  setRequestHeader(
+    event,
+    TIMEZONE_HEADER_KEY,
+    (await getTimezone(event)) || 'UTC',
+  )
   // setContentSecurityPolicy(event);
   setResponseHeaders(event)
 })

package/server/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "../.nuxt/tsconfig.server.json"
+  "extends": "../.playground/.nuxt/tsconfig.server.json"
 }

package/server/utils/util.ts

@@ -0,0 +1,2 @@
+export const getCspAsString = (csp = {} as Record<string, Array<string>>) =>
+  Object.keys(csp).reduce((p, c) => (p += `${c} ${csp[c].join(' ')};`), '')

package/tailwind.config.ts

@@ -1,8 +1,8 @@
-import { Config } from 'tailwindcss'
-import colors from 'tailwindcss/colors'
-import { PluginAPI } from 'tailwindcss/types/config'
 import formsPlugin from '@tailwindcss/forms'
 import typographyPlugin from '@tailwindcss/typography'
+import type { Config } from 'tailwindcss'
+import colors from 'tailwindcss/colors'
+import type { PluginAPI } from 'tailwindcss/types/config'
 
 const heading = (theme: PluginAPI['theme']): Record<string, string> => ({
   fontWeight: theme('fontWeight.bold'),

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

@@ -60,9 +60,6 @@ export const getCombinedErrorMessages = (
   return errorMessages
 }
 
-export const getCspAsString = (csp = {} as Record<string, Array<string>>) =>
-  Object.keys(csp).reduce((p, c) => (p += `${c} ${csp[c].join(' ')};`), '')
-
 export const getDomainTldPort = (host: string) => {
   const hostParts = host.split('.')
 
@@ -106,10 +103,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<{ timezone: string }>(
       `http://ip-api.com/json/${event.node.req.headers['x-real-ip']}`,
-    )
-  ).timezone
+    ).catch(() => {})
+
+    if (ipApiResult) {
+      return ipApiResult.timezone
+    }
+  }
+
+  return undefined
+}