Updated prisma.

package.json

@@ -66,13 +66,13 @@
     "@dicebear/core": "^9.2.3",
     "@fontsource/inter": "^5.2.8",
     "@hello-pangea/dnd": "^17.0.0",
-    "@prisma/adapter-pg": "^6.18.0",
+    "@prisma/adapter-pg": "^7.0.0",
-    "@prisma/client": "^6.18.0",
+    "@prisma/client": "^7.0.0",
     "@prisma/extension-read-replicas": "^0.4.1",
     "@react-spring/web": "^10.0.3",
     "@svgr/cli": "^8.1.0",
     "@tanstack/react-query": "^5.90.5",
-    "@umami/react-zen": "^0.208.0",
+    "@umami/react-zen": "^0.210.0",
     "@umami/redis-client": "^0.29.0",
     "bcryptjs": "^3.0.2",
     "chalk": "^5.6.2",
@@ -107,7 +107,7 @@
     "npm-run-all": "^4.1.5",
     "papaparse": "^5.5.3",
     "pg": "^8.16.3",
-    "prisma": "^6.18.0",
+    "prisma": "^7.0.0",
     "pure-rand": "^7.0.1",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",

prisma.config.ts

@@ -0,0 +1,8 @@
+import 'dotenv/config';
+import { defineConfig, env } from 'prisma/config';
+
+export default defineConfig({
+  datasource: {
+    url: env('DATABASE_URL'),
+  },
+});

prisma/schema.prisma

@@ -6,7 +6,6 @@ generator client {
 
 datasource db {
   provider     = "postgresql"
-  url          = env("DATABASE_URL")
   relationMode = "prisma"
 }
 

public/site.webmanifest

@@ -1,19 +1,19 @@
 {
-    "name": "",
+  "name": "",
-    "short_name": "",
+  "short_name": "",
-    "icons": [
+  "icons": [
-        {
+    {
-            "src": "/android-chrome-192x192.png",
+      "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
+      "sizes": "192x192",
-            "type": "image/png"
+      "type": "image/png"
-        },
+    },
-        {
+    {
-            "src": "/android-chrome-512x512.png",
+      "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
+      "sizes": "512x512",
-            "type": "image/png"
+      "type": "image/png"
-        }
+    }
-    ],
+  ],
-    "theme_color": "#ffffff",
+  "theme_color": "#ffffff",
-    "background_color": "#ffffff",
+  "background_color": "#ffffff",
-    "display": "standalone"
+  "display": "standalone"
 }

scripts/build-geo.js

@@ -50,21 +50,23 @@ const downloadDirect = (url, originalUrl) =>
     https.get(url, res => {
       // Follow redirects
       if (res.statusCode === 301 || res.statusCode === 302) {
-        downloadDirect(res.headers.location, originalUrl || url).then(resolve).catch(reject);
+        downloadDirect(res.headers.location, originalUrl || url)
+          .then(resolve)
+          .catch(reject);
         return;
       }
-      
+
       const filename = path.join(dest, path.basename(originalUrl || url));
       const fileStream = fs.createWriteStream(filename);
-      
+
       res.pipe(fileStream);
-      
+
       fileStream.on('finish', () => {
         fileStream.close();
         console.log('Saved geo database:', filename);
         resolve();
       });
-      
+
       fileStream.on('error', e => {
         reject(e);
       });
@@ -78,27 +80,29 @@ if (isDirectMmdb) {
     process.exit(1);
   });
 } else {
-  downloadCompressed(url).then(
+  downloadCompressed(url)
-    res =>
+    .then(
-      new Promise((resolve, reject) => {
+      res =>
-        res.on('entry', entry => {
+        new Promise((resolve, reject) => {
-          if (entry.path.endsWith('.mmdb')) {
+          res.on('entry', entry => {
-            const filename = path.join(dest, path.basename(entry.path));
+            if (entry.path.endsWith('.mmdb')) {
-            entry.pipe(fs.createWriteStream(filename));
+              const filename = path.join(dest, path.basename(entry.path));
+              entry.pipe(fs.createWriteStream(filename));
 
-            console.log('Saved geo database:', filename);
+              console.log('Saved geo database:', filename);
-          }
+            }
-        });
+          });
 
-        res.on('error', e => {
+          res.on('error', e => {
-          reject(e);
+            reject(e);
-        });
+          });
-        res.on('finish', () => {
+          res.on('finish', () => {
-          resolve();
+            resolve();
-        });
+          });
-      }),
+        }),
-  ).catch(e => {
+    )
-    console.error('Failed to download geo database:', e);
+    .catch(e => {
-    process.exit(1);
+      console.error('Failed to download geo database:', e);
-  });
+      process.exit(1);
+    });
 }

src/app/(main)/App.tsx

@@ -1,13 +1,13 @@
 'use client';
-import { Grid, Loading, Column, Row } from '@umami/react-zen';
+import { Column, Grid, Loading, Row } from '@umami/react-zen';
 import Script from 'next/script';
-import { UpdateNotice } from './UpdateNotice';
-import { SideNav } from '@/app/(main)/SideNav';
-import { useLoginQuery, useConfig, useNavigation } from '@/components/hooks';
-import { MobileNav } from '@/app/(main)/MobileNav';
 import { useEffect } from 'react';
-import { removeItem, setItem } from '@/lib/storage';
+import { MobileNav } from '@/app/(main)/MobileNav';
+import { SideNav } from '@/app/(main)/SideNav';
+import { useConfig, useLoginQuery, useNavigation } from '@/components/hooks';
 import { LAST_TEAM_CONFIG } from '@/lib/constants';
+import { removeItem, setItem } from '@/lib/storage';
+import { UpdateNotice } from './UpdateNotice';
 
 export function App({ children }) {
   const { user, isLoading, error } = useLoginQuery();
@@ -27,7 +27,9 @@ export function App({ children }) {
   }
 
   if (error) {
-    window.location.href = `${process.env.basePath || ''}/login`;
+    window.location.href = config.cloudMode
+      ? `${process.env.cloudUrl}/login`
+      : `${process.env.basePath || ''}/login`;
     return null;
   }
 

src/app/(main)/websites/[websiteId]/(reports)/journeys/Journey.module.css

@@ -208,7 +208,7 @@
 
 .start:before,
 .end:before {
-  content: '';
+  content: "";
   position: absolute;
   border-radius: 100%;
   border: 3px solid var(--journey-line-color);

src/components/metrics/MetricLabel.tsx

@@ -137,11 +137,6 @@ export function MetricLabel({ type, data }: MetricLabelProps) {
       return formatValue(label, 'language');
 
     default:
-      return (
+      return <FilterLink type={type} value={label} />;
-        <FilterLink
-          type={type}
-          value={label}
-        />
-      );
   }
 }

src/lib/__tests__/charts.test.ts

@@ -14,23 +14,21 @@ describe('renderNumberLabels', () => {
     expect(renderNumberLabels(input)).toBe(expected);
   });
 
-  test.each([['12500', '12.5k']])(
+  test.each([
-    "formats numbers ≥ 10K as 'X.Xk' (%s → %s)",
+    ['12500', '12.5k'],
-    (input, expected) => {
+  ])("formats numbers ≥ 10K as 'X.Xk' (%s → %s)", (input, expected) => {
-      expect(renderNumberLabels(input)).toBe(expected);
+    expect(renderNumberLabels(input)).toBe(expected);
-    },
+  });
-  );
 
   test.each([['1500', '1.50k']])("formats numbers ≥ 1K as 'X.XXk' (%s → %s)", (input, expected) => {
     expect(renderNumberLabels(input)).toBe(expected);
   });
 
-  test.each([['999', '999']])(
+  test.each([
-    'calls formatNumber for values < 1000 (%s → %s)',
+    ['999', '999'],
-    (input, expected) => {
+  ])('calls formatNumber for values < 1000 (%s → %s)', (input, expected) => {
-      expect(renderNumberLabels(input)).toBe(expected);
+    expect(renderNumberLabels(input)).toBe(expected);
-    },
+  });
-  );
 
   test.each([
     ['0', '0'],

src/lib/prisma.ts

@@ -1,10 +1,10 @@
-import debug from 'debug';
 import { PrismaPg } from '@prisma/adapter-pg';
 import { readReplicas } from '@prisma/extension-read-replicas';
+import debug from 'debug';
 import { PrismaClient } from '@/generated/prisma/client';
-import { SESSION_COLUMNS, OPERATORS, DEFAULT_PAGE_SIZE, FILTER_COLUMNS } from './constants';
+import { DEFAULT_PAGE_SIZE, FILTER_COLUMNS, OPERATORS, SESSION_COLUMNS } from './constants';
-import { QueryOptions, QueryFilters, Operator } from './types';
 import { filtersObjectToArray } from './params';
+import type { Operator, QueryFilters, QueryOptions } from './types';
 
 const log = debug('umami:prisma');
 

src/queries/prisma/pixel.ts

@@ -1,6 +1,6 @@
-import { Prisma } from '@/generated/prisma/client';
+import type { Prisma } from '@/generated/prisma/client';
 import prisma from '@/lib/prisma';
-import { QueryFilters } from '@/lib/types';
+import type { QueryFilters } from '@/lib/types';
 
 export async function findPixel(criteria: Prisma.PixelFindUniqueArgs) {
   return prisma.client.pixel.findUnique(criteria);

src/styles/global.css

@@ -8,7 +8,7 @@ body {
   min-height: 100vh;
 }
 
-html[style*='padding-right'] {
+html[style*="padding-right"] {
   padding-right: 0 !important;
 }