From 74f95df6af8b3d401d53a0036a87a8c81b04d020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B6hm?= <alex@roehms.de>
Date: Sat, 16 Nov 2024 13:40:55 +0100
Subject: [PATCH] umami update

---
 Dockerfile     |  9 ---------
 nuxt.config.ts | 28 ++++++++++++++++++++++++----
 package.json   |  2 +-
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6e61a76..fb7f31f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,20 +3,11 @@ LABEL authors="Alex Roehm"
 ARG VERSION
 ARG BUILDTIME
 ARG REVISION
-ARG NUXT_PUBLIC_URL
-ARG NUXT_PUBLIC_UMAMI_HOST
-ARG NUXT_PUBLIC_UMAMI_ID
-ARG NUXT_PUBLIC_SKIN
-ARG NUXT_PUBLIC_ENABLE_DARK_MODE
-ARG NUXT_PUBLIC_LOGO
-ARG NUXT_PUBLIC_LOGO_DARK
-ARG NUXT_PUBLIC_EXT_MENU_DE
 
 ENV DATABASE_PATH=/data
 ENV DATABASE_FILE=podcasts.sqlite
 ENV DATA_PATH=/var/www
 
-
 RUN apt-get update && apt-get install -y \
     curl dumb-init logrotate nginx vim \
     && rm -rf /var/lib/apt/lists/*
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 065fdc4..000e8b5 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -24,9 +24,9 @@ function setEnvUndefinedWhenEmpty( envvar: string | undefined ) :string | undefi
 
 export default defineNuxtConfig({
   modules: [
-    '@nuxtjs/i18n', '@nuxtjs/tailwindcss', '@nuxtjs/color-mode'
+    '@nuxtjs/i18n', '@nuxtjs/tailwindcss', '@nuxtjs/color-mode', 'nuxt-umami'
   ],
-  extends: [ 'nuxt-umami' ],
+
   i18n: {
     strategy: 'prefix_except_default',
     defaultLocale: 'de',
@@ -45,12 +45,14 @@ export default defineNuxtConfig({
     lazy: true,
     langDir: 'locales',
   },
+
   colorMode: {
     preference: 'system', // default value of $colorMode.preference
     fallback: 'light', // fallback value if not system preference found
     classSuffix: '',
     classPrefix: '',
   },
+
   // css: [ './assets/css/tailwind.css' 
   // ],
   // app: {
@@ -59,6 +61,20 @@ export default defineNuxtConfig({
   //     mode: 'out-in'
   //   }
   // },
+  umami: {
+    id: setEnv(process.env.NUXT_PUBLIC_UMAMI_ID,''),
+    host: setEnv(process.env.NUXT_PUBLIC_UMAMI_HOST,''),
+    autoTrack: true,
+    // proxy: 'cloak',
+    // useDirective: true,
+    // ignoreLocalhost: true,
+    // excludeQueryParams: false,
+    // domains: ['cool-site.app', 'my-space.site'],
+    // customEndpoint: '/my-custom-endpoint',
+    // enabled: false,
+    // logErrors: true,
+  },
+
   runtimeConfig: {
     public: {
       url: process.env.NUXT_PUBLIC_URL,
@@ -72,16 +88,20 @@ export default defineNuxtConfig({
       umamiActive: setEnvBool(process.env.NUXT_PUBLIC_UMAMI_ID)
     }
   },
+
   appConfig: {
     umami: {
       autoTrack: setEnvBool(process.env.NUXT_PUBLIC_UMAMI_ID),
       version: 2
   }},
+
   // nitro: {
   //   routeRules: {
   //     "/api/**": { proxy: 'localhost:3003' },
   //     "/s/**": { proxy: 'localhost:3003' }
   //   }
   // },
-  devtools: { enabled: false }
-})
+  devtools: { enabled: false },
+
+  compatibilityDate: '2024-11-16'
+})
\ No newline at end of file
diff --git a/package.json b/package.json
index 1c382b4..a5481f4 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   "dependencies": {
     "id3-parser": "^3.0.0",
     "jwt-payloader": "^1.0.1",
-    "nuxt-umami": "^2.6.3"
+    "nuxt-umami": "^3.0.2"
   },
   "resolutions": {
     "string-width": "4.2.3"