From 052ad4c2caca1e237d92d95582c130c1e211a7c9 Mon Sep 17 00:00:00 2001
From: Arnaud Scheffler <arnaud.scheffler@protonmail.com>
Date: Sun, 3 Nov 2024 13:09:54 +0100
Subject: [PATCH] fix: improve umami configuration

---
 Dockerfile                | 3 ++-
 src/routes/+layout.svelte | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 80084a3..0b96f96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM node:18.19-alpine AS builder
 
-ARG VITE_EXTRA_HEAD
+ARG PUBLIC_UMAMI_URL
+ARG PUBLIC_UMAMI_WEBSTIE
 
 WORKDIR /app-builder
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index ba63761..1029062 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-	import { title, meta } from '$lib/data/global';
+	import { meta, title } from '$lib/data/global';
 	import '../app.css';
 	let { children } = $props();
+	import { PUBLIC_UMAMI_URL, PUBLIC_UMAMI_WEBSTIE } from '$env/static/public';
 </script>
 
 {@render children()}
@@ -9,7 +10,7 @@
 <svelte:head>
 	<title>{title}</title>
 	<meta name="description" content={meta.description} />
-	{#if import.meta.env.VITE_EXTRA_HEAD}
-		{@html import.meta.env.VITE_EXTRA_HEAD}
+	{#if PUBLIC_UMAMI_URL && PUBLIC_UMAMI_WEBSTIE}
+		<script defer src={PUBLIC_UMAMI_URL} data-website-id={PUBLIC_UMAMI_WEBSTIE}></script>
 	{/if}
 </svelte:head>