fix: umami

2026-02-09 22:32:35 +01:00 · 2026-02-09 19:30:52 +01:00
6 changed files with 25 additions and 5 deletions
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -200,6 +200,7 @@ jobs:
            --build-arg NEXT_PUBLIC_TARGET=${{ needs.prepare.outputs.target }} \
            --build-arg DIRECTUS_URL=${{ needs.prepare.outputs.directus_url }} \
            --build-arg UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }} \
            --build-arg NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }} \
            -t registry.infra.mintel.me/mintel/mb-grid-solutions:${{ needs.prepare.outputs.image_tag }} \
            --push .
@@ -269,6 +270,7 @@ jobs:
          GOTIFY_URL=${{ secrets.GOTIFY_URL || vars.GOTIFY_URL }}
          GOTIFY_TOKEN=${{ secrets.GOTIFY_TOKEN || vars.GOTIFY_TOKEN }}
          UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
          NEXT_PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.UMAMI_WEBSITE_ID || secrets.NEXT_PUBLIC_UMAMI_WEBSITE_ID || vars.UMAMI_WEBSITE_ID || vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}
          UMAMI_API_ENDPOINT=${{ secrets.UMAMI_API_ENDPOINT || secrets.NEXT_PUBLIC_UMAMI_SCRIPT_URL || vars.UMAMI_API_ENDPOINT || 'https://analytics.infra.mintel.me' }}
          # Project
--- a/2
+++ b/2
@@ -11,12 +11,14 @@ ARG NEXT_PUBLIC_BASE_URL
 ARG UMAMI_API_ENDPOINT
 ARG NEXT_PUBLIC_TARGET
 ARG DIRECTUS_URL
 ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
 ARG NPM_TOKEN
 ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
 ENV UMAMI_API_ENDPOINT=$UMAMI_API_ENDPOINT
 ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
 ENV DIRECTUS_URL=$DIRECTUS_URL
 ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
 ENV NPM_TOKEN=$NPM_TOKEN
 ENV SENTRY_SUPPRESS_TURBOPACK_WARNING=1
 ENV SKIP_RUNTIME_ENV_VALIDATION=true
--- a/app/[locale]/layout.tsx
+++ b/app/[locale]/layout.tsx
@@ -6,6 +6,8 @@ import { NextIntlClientProvider } from "next-intl";
 import { getMessages } from "next-intl/server";
 import { notFound } from "next/navigation";
 import { LazyMotion, domAnimation } from "framer-motion";
 import AnalyticsProvider from "@/components/analytics/AnalyticsProvider";
 import { config } from "@/lib/config";
 const inter = Inter({
  subsets: ["latin"],
@@ -108,10 +110,12 @@ export default async function RootLayout({
  // Track pageview on the server
  // This is safe to call here because layout is a Server Component
-  const services = (
+  const serverServices = (
    await import("@/lib/services/create-services.server")
  ).getServerAppServices();
-  services.analytics.trackPageview();
+
  // Track server-side (initial load)
  serverServices.analytics.trackPageview("/");
  return (
    <html lang={locale} className={`${inter.variable}`}>
@@ -123,6 +127,7 @@ export default async function RootLayout({
      </head>
      <body className="antialiased">
        <NextIntlClientProvider messages={messages}>
          <AnalyticsProvider websiteId={config.analytics.umami.websiteId} />
          <LazyMotion features={domAnimation}>
            <Layout>{children}</Layout>
          </LazyMotion>
--- a/lib/config.ts
+++ b/lib/config.ts
@@ -27,9 +27,11 @@ function createConfig() {
    analytics: {
      umami: {
-        websiteId: env.UMAMI_WEBSITE_ID,
+        websiteId: env.NEXT_PUBLIC_UMAMI_WEBSITE_ID || env.UMAMI_WEBSITE_ID,
        apiEndpoint: env.UMAMI_API_ENDPOINT,
-        enabled: Boolean(env.UMAMI_WEBSITE_ID),
+        enabled: Boolean(
          env.NEXT_PUBLIC_UMAMI_WEBSITE_ID || env.UMAMI_WEBSITE_ID,
        ),
      },
    },
--- a/lib/env.ts
+++ b/lib/env.ts
@@ -26,6 +26,10 @@ export const envSchema = z
      preprocessEmptyString,
      z.string().optional(),
    ),
    NEXT_PUBLIC_UMAMI_WEBSITE_ID: z.preprocess(
      preprocessEmptyString,
      z.string().optional(),
    ),
    UMAMI_API_ENDPOINT: z.preprocess(
      preprocessEmptyString,
      z.string().url().default("https://analytics.infra.mintel.me"),
@@ -115,6 +119,7 @@ export function getRawEnv() {
    NEXT_PUBLIC_TARGET: process.env.NEXT_PUBLIC_TARGET,
    UMAMI_WEBSITE_ID:
      process.env.UMAMI_WEBSITE_ID || process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
    NEXT_PUBLIC_UMAMI_WEBSITE_ID: process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID,
    UMAMI_API_ENDPOINT:
      process.env.UMAMI_API_ENDPOINT ||
      process.env.UMAMI_SCRIPT_URL ||
--- a/middleware.ts
+++ b/middleware.ts
@@ -14,5 +14,9 @@ export default createMiddleware({
 export const config = {
  // Matcher for all pages and internationalized pathnames
  // excluding api, _next, static files, etc.
-  matcher: ["/((?!api|_next|_vercel|.*\\..*).*)", "/", "/(de)/:path*"],
+  matcher: [
    "/((?!api|stats|errors|_next|_vercel|.*\\..*).*)",
    "/",
    "/(de)/:path*",
  ],
 };
Author	SHA1	Message	Date
Marc Mintel	90e9f37849	fix: umami Some checks failed Build & Deploy / 🔍 Prepare Environment (push) Successful in 4s Details Build & Deploy / 🧪 QA (push) Successful in 1m23s Details Build & Deploy / 🏗️ Build (push) Failing after 3m6s Details Build & Deploy / 🚀 Deploy (push) Has been skipped Details Build & Deploy / 🔔 Notifications (push) Successful in 2s Details	2026-02-09 22:32:35 +01:00
Marc Mintel	9eaaa798a3	fix: umami All checks were successful Build & Deploy / 🔍 Prepare Environment (push) Successful in 12s Details Build & Deploy / 🧪 QA (push) Successful in 1m24s Details Build & Deploy / 🏗️ Build (push) Successful in 5m58s Details Build & Deploy / 🚀 Deploy (push) Successful in 15s Details Build & Deploy / 🔔 Notifications (push) Successful in 2s Details	2026-02-09 19:30:52 +01:00