Skip to content

Commit 35068d3

Browse files
authored
Merge pull request #3109 from umami-software/analytics
v2.15.0
2 parents dda53ab + 690ab59 commit 35068d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1280
-951
lines changed

docker-compose.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
depends_on:
1313
db:
1414
condition: service_healthy
15+
init: true
1516
restart: always
1617
healthcheck:
1718
test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]

package.json

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "umami",
3-
"version": "2.14.0",
3+
"version": "2.15.0",
44
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
55
"author": "Umami Software, Inc. <[email protected]>",
66
"license": "MIT",
@@ -63,18 +63,21 @@
6363
"cacheDirectories": [
6464
".next/cache"
6565
],
66+
"resolutions": {
67+
"jackspeak": "2.1.1"
68+
},
6669
"dependencies": {
6770
"@clickhouse/client": "^1.4.1",
6871
"@date-fns/utc": "^1.2.0",
6972
"@dicebear/collection": "^9.2.1",
7073
"@dicebear/core": "^9.2.1",
7174
"@fontsource/inter": "^4.5.15",
72-
"@prisma/client": "5.17",
75+
"@prisma/client": "5.22.0",
7376
"@prisma/extension-read-replicas": "^0.3.0",
7477
"@react-spring/web": "^9.7.3",
7578
"@tanstack/react-query": "^5.28.6",
7679
"@umami/prisma-client": "^0.14.0",
77-
"@umami/redis-client": "^0.21.0",
80+
"@umami/redis-client": "^0.24.0",
7881
"chalk": "^4.1.1",
7982
"chart.js": "^4.4.2",
8083
"chartjs-adapter-date-fns": "^3.0.0",
@@ -99,16 +102,15 @@
99102
"kafkajs": "^2.1.0",
100103
"maxmind": "^4.3.6",
101104
"md5": "^2.3.0",
102-
"moment-timezone": "^0.5.35",
103-
"next": "14.2.10",
105+
"next": "15.0.4",
104106
"next-basics": "^0.39.0",
105107
"node-fetch": "^3.2.8",
106108
"npm-run-all": "^4.1.5",
107-
"prisma": "5.17",
108-
"react": "^18.2.0",
109+
"prisma": "5.22.0",
110+
"react": "^19.0.0",
109111
"react-basics": "^0.125.0",
110112
"react-beautiful-dnd": "^13.1.0",
111-
"react-dom": "^18.2.0",
113+
"react-dom": "^19.0.0",
112114
"react-error-boundary": "^4.0.4",
113115
"react-intl": "^6.5.5",
114116
"react-simple-maps": "^2.3.0",

public/intl/messages/ja-JP.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@
14501450
"label.visits": [
14511451
{
14521452
"type": 0,
1453-
"value": "訪問者数"
1453+
"value": "訪問数"
14541454
}
14551455
],
14561456
"label.website": [

0 commit comments

Comments
 (0)