Merge branch 'dev' into brian/um-16-clickhouse-support

This commit is contained in:
Brian Cao 2022-07-22 17:03:42 -07:00
commit 304314fff0
114 changed files with 1474 additions and 1019 deletions

View file

@ -1,13 +1,13 @@
{
"name": "umami",
"version": "1.33.1",
"version": "1.35.0",
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
"author": "Mike Cao <mike@mikecao.com>",
"license": "MIT",
"homepage": "https://umami.is",
"repository": {
"type": "git",
"url": "https://github.com/mikecao/umami.git"
"url": "https://github.com/umami-software/umami.git"
},
"scripts": {
"dev": "next dev",
@ -55,7 +55,7 @@
},
"dependencies": {
"@fontsource/inter": "4.5.7",
"@prisma/client": "4.0.0",
"@prisma/client": "4.1.0",
"bcryptjs": "^2.4.3",
"chalk": "^4.1.1",
"chart.js": "^2.9.4",
@ -81,7 +81,7 @@
"maxmind": "^4.3.6",
"moment-timezone": "^0.5.33",
"next": "^12.2.0",
"node-fetch": "^3.2.3",
"node-fetch": "^3.2.8",
"npm-run-all": "^4.1.5",
"prop-types": "^15.7.2",
"react": "^17.0.0",
@ -118,7 +118,7 @@
"postcss-preset-env": "7.4.3",
"postcss-rtlcss": "^3.6.1",
"prettier": "^2.6.2",
"prisma": "4.0.0",
"prisma": "4.1.0",
"prompts": "2.4.2",
"rollup": "^2.70.1",
"rollup-plugin-terser": "^7.0.2",