Merge branch 'analytics' into qa

Author: mikecao

.github/workflows/ci.yml

@@ -16,9 +16,9 @@ jobs:
     strategy:
       matrix:
         include:
-        - node-version: 18.17
+        - node-version: 18.18
           db-type: postgresql
-        - node-version: 18.17
+        - node-version: 18.18
           db-type: mysql
 
     steps:

Dockerfile

@@ -36,7 +36,7 @@ RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
 RUN set -x \
-    && apk add --no-cache curl \
+    && apk add --no-cache curl openssl \
     && yarn add npm-run-all dotenv semver [email protected]
 
 # You only need to copy next.config.js if you are NOT using the default configuration

README.md

@@ -35,7 +35,7 @@ A detailed getting started guide can be found at [umami.is/docs](https://umami.i
 
 ### Requirements
 
-- A server with Node.js version 16.13 or newer
+- A server with Node.js version 18.18 or newer
 - A database. Umami supports [MariaDB](https://www.mariadb.org/) (minimum v10.5), [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
 
 ### Install Yarn

db/postgresql/schema.prisma

@@ -1,5 +1,6 @@
 generator client {
-  provider = "prisma-client-js"
+  provider      = "prisma-client-js"
+  binaryTargets = ["native", "linux-musl-openssl-3.0.x"]
 }
 
 datasource db {
@@ -19,8 +20,8 @@ model User {
   updatedAt   DateTime? @updatedAt @map("updated_at") @db.Timestamptz(6)
   deletedAt   DateTime? @map("deleted_at") @db.Timestamptz(6)
 
-  websiteUser       Website[] @relation("user")
-  websiteCreateUser Website[] @relation("createUser")
+  websiteUser       Website[]  @relation("user")
+  websiteCreateUser Website[]  @relation("createUser")
   teamUser          TeamUser[]
   report            Report[]
 
@@ -112,7 +113,6 @@ model WebsiteEvent {
   @@index([visitId])
   @@index([websiteId])
   @@index([websiteId, createdAt])
-
   @@index([websiteId, createdAt, urlPath])
   @@index([websiteId, createdAt, urlQuery])
   @@index([websiteId, createdAt, referrerDomain])
@@ -150,7 +150,7 @@ model SessionData {
   id          String    @id() @map("session_data_id") @db.Uuid
   websiteId   String    @map("website_id") @db.Uuid
   sessionId   String    @map("session_id") @db.Uuid
-  dataKey    String    @map("data_key") @db.VarChar(500)
+  dataKey     String    @map("data_key") @db.VarChar(500)
   stringValue String?   @map("string_value") @db.VarChar(500)
   numberValue Decimal?  @map("number_value") @db.Decimal(19, 4)
   dateValue   DateTime? @map("date_value") @db.Timestamptz(6)

docker-compose.yml

@@ -12,6 +12,7 @@ services:
     depends_on:
       db:
         condition: service_healthy
+    init: true
     restart: always
     healthcheck:
       test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <[email protected]>",
   "license": "MIT",
@@ -63,18 +63,21 @@
   "cacheDirectories": [
     ".next/cache"
   ],
+  "resolutions": {
+    "jackspeak": "2.1.1"
+  },
   "dependencies": {
     "@clickhouse/client": "^1.4.1",
     "@date-fns/utc": "^1.2.0",
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.17",
+    "@prisma/client": "5.22.0",
     "@prisma/extension-read-replicas": "^0.3.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
-    "@umami/redis-client": "^0.21.0",
+    "@umami/redis-client": "^0.24.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -99,16 +102,15 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "md5": "^2.3.0",
-    "moment-timezone": "^0.5.35",
-    "next": "14.2.10",
+    "next": "15.0.4",
     "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.17",
-    "react": "^18.2.0",
+    "prisma": "5.22.0",
+    "react": "^19.0.0",
     "react-basics": "^0.125.0",
     "react-beautiful-dnd": "^13.1.0",
-    "react-dom": "^18.2.0",
+    "react-dom": "^19.0.0",
     "react-error-boundary": "^4.0.4",
     "react-intl": "^6.5.5",
     "react-simple-maps": "^2.3.0",
@@ -132,7 +134,7 @@
     "@svgr/rollup": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
     "@types/cypress": "^1.1.3",
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "@types/node": "^20.9.0",
     "@types/react": "^18.2.41",
     "@types/react-dom": "^18.2.17",

public/intl/messages/ja-JP.json

@@ -1450,7 +1450,7 @@
   "label.visits": [
     {
       "type": 0,
-      "value": "訪問者数"
+      "value": "訪問数"
     }
   ],
   "label.website": [