watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 14:17:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	src/app/api/websites/[websiteId]/metrics/route.ts
#	src/queries/sql/getChannelMetrics.ts
This commit is contained in:
Mike Cao 2025-07-29 19:15:55 -07:00
commit 554c627a58
5 changed files with 828 additions and 812 deletions
Download patch file Download diff file Expand all files Collapse all files

51
package.json
View file

@ -70,10 +70,10 @@
".next/cache"
],
"dependencies": {
"@clickhouse/client": "^1.11.2",
"@clickhouse/client": "^1.12.0",
"@date-fns/utc": "^1.2.0",
"@dicebear/collection": "^9.2.1",
"@dicebear/core": "^9.2.1",
"@dicebear/collection": "^9.2.3",
"@dicebear/core": "^9.2.3",
"@fontsource/inter": "^4.5.15",
"@hello-pangea/dnd": "^17.0.0",
"@prisma/adapter-pg": "^6.12.0",
@ -81,11 +81,11 @@
"@prisma/extension-read-replicas": "^0.4.1",
"@react-spring/web": "^9.7.3",
"@svgr/cli": "^8.1.0",
"@tanstack/react-query": "^5.80.10",
"@umami/react-zen": "^0.153.0",
"@tanstack/react-query": "^5.83.0",
"@umami/react-zen": "^0.154.0",
"@umami/redis-client": "^0.27.0",
"bcryptjs": "^2.4.3",
"chalk": "^4.1.1",
"bcryptjs": "^3.0.2",
"chalk": "^5.4.1",
"chart.js": "^4.5.0",
"chartjs-adapter-date-fns": "^3.0.0",
"classnames": "^2.3.1",
@ -104,27 +104,26 @@
"ipaddr.js": "^2.0.1",
"is-ci": "^3.0.1",
"is-docker": "^3.0.0",
"is-localhost-ip": "^1.4.0",
"is-localhost-ip": "^2.0.0",
"isbot": "^5.1.16",
"jsonwebtoken": "^9.0.2",
"jszip": "^3.10.1",
"kafkajs": "^2.1.0",
"lucide-react": "^0.517.0",
"maxmind": "^4.3.27",
"lucide-react": "^0.526.0",
"maxmind": "^4.3.28",
"md5": "^2.3.0",
"next": "15.4.3",
"next": "15.4.4",
"node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5",
"papaparse": "^5.5.3",
"prisma": "6.7.0",
"pg": "^8.16.3",
"prisma": "6.12.0",
"pure-rand": "^6.1.0",
"pure-rand": "^7.0.1",
"react": "^19.0.0",
"react-basics": "^0.126.0",
"react-dom": "^19.0.0",
"react-error-boundary": "^4.0.4",
"react-intl": "^6.5.5",
"react-intl": "^7.1.11",
"react-simple-maps": "^2.3.0",
"react-use-measure": "^2.0.4",
"react-window": "^1.8.6",
@ -133,12 +132,12 @@
"serialize-error": "^12.0.0",
"thenby": "^1.3.4",
"uuid": "^11.1.0",
"zod": "^3.25.67",
"zustand": "^5.0.5"
"zod": "^3.25.76",
"zustand": "^5.0.6"
},
"devDependencies": {
"@formatjs/cli": "^4.2.29",
"@netlify/plugin-nextjs": "^5.11.3",
"@netlify/plugin-nextjs": "^5.11.6",
"@rollup/plugin-alias": "^5.0.0",
"@rollup/plugin-commonjs": "^25.0.4",
"@rollup/plugin-json": "^6.0.0",
@ -146,25 +145,25 @@
"@rollup/plugin-replace": "^5.0.2",
"@rollup/plugin-terser": "^0.4.4",
"@types/jest": "^29.5.14",
"@types/node": "^22.15.32",
"@types/node": "^22.16.5",
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@types/react-window": "^1.8.8",
"@typescript-eslint/eslint-plugin": "^8.34.1",
"@typescript-eslint/parser": "^8.34.1",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"babel-plugin-react-compiler": "19.1.0-rc.2",
"cross-env": "^7.0.3",
"cypress": "^13.6.6",
"esbuild": "^0.25.0",
"esbuild": "^0.25.8",
"eslint": "^8.33.0",
"eslint-config-next": "^14.2.30",
"eslint-config-prettier": "^8.5.0",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-css-modules": "^2.12.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-jest": "^27.9.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-prettier": "^5.5.3",
"extract-react-intl-messages": "^4.1.1",
"husky": "^8.0.3",
"jest": "^29.7.0",
@ -173,7 +172,7 @@
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^15.1.0",
"postcss-preset-env": "7.8.3",
"prettier": "^2.6.2",
"prettier": "^3.6.2",
"prompts": "2.4.2",
"rollup": "^3.28.0",
"rollup-plugin-copy": "^3.4.0",
@ -183,7 +182,7 @@
"rollup-plugin-node-externals": "^6.1.1",
"rollup-plugin-postcss": "^4.0.2",
"stylelint": "^15.10.1",
"stylelint-config-css-modules": "^4.4.0",
"stylelint-config-css-modules": "^4.5.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-recommended": "^14.0.0",
"tar": "^6.1.2",