Merge branch 'dev' of https://github.com/umami-software/umami into feat/um-121-v2-migration-script

This commit is contained in:
Francis Cao 2023-02-02 10:00:53 -08:00
commit d6e17fe982
257 changed files with 4340 additions and 4079 deletions

View file

@ -1,6 +1,6 @@
{
"name": "umami",
"version": "2.0.0-beta.2",
"version": "2.0.0-beta.3",
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
"author": "Mike Cao <mike@mikecao.com>",
"license": "MIT",
@ -60,9 +60,9 @@
],
"dependencies": {
"@fontsource/inter": "4.5.7",
"@prisma/client": "4.8.0",
"@prisma/client": "4.9.0",
"@tanstack/react-query": "^4.16.1",
"@umami/prisma-client": "^0.1.0",
"@umami/prisma-client": "^0.2.0",
"@umami/redis-client": "^0.1.0",
"chalk": "^4.1.1",
"chart.js": "^2.9.4",
@ -95,7 +95,7 @@
"npm-run-all": "^4.1.5",
"prop-types": "^15.7.2",
"react": "^18.2.0",
"react-basics": "^0.44.0",
"react-basics": "^0.64.0",
"react-beautiful-dnd": "^13.1.0",
"react-dom": "^18.2.0",
"react-intl": "^5.24.7",
@ -104,12 +104,13 @@
"react-tooltip": "^4.2.21",
"react-use-measure": "^2.0.4",
"react-window": "^1.8.6",
"redis": "^4.5.0",
"redis": "^4.6.2",
"request-ip": "^3.3.0",
"semver": "^7.3.6",
"thenby": "^1.3.4",
"timezone-support": "^2.0.2",
"uuid": "^8.3.2",
"yup": "^0.32.11",
"zustand": "^3.7.2"
},
"devDependencies": {
@ -128,20 +129,20 @@
"extract-react-intl-messages": "^4.1.1",
"husky": "^7.0.0",
"lint-staged": "^11.0.0",
"postcss": "^8.4.12",
"postcss": "^8.4.21",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^14.0.2",
"postcss-preset-env": "7.4.3",
"postcss-rtlcss": "^3.6.1",
"postcss-import": "^15.1.0",
"postcss-preset-env": "7.8.3",
"postcss-rtlcss": "^4.0.1",
"prettier": "^2.6.2",
"prisma": "4.8.0",
"prisma": "4.9.0",
"prompts": "2.4.2",
"rollup": "^2.70.1",
"rollup-plugin-terser": "^7.0.2",
"stylelint": "^14.5.3",
"stylelint": "^14.16.1",
"stylelint-config-css-modules": "^4.1.0",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-recommended": "^7.0.0",
"stylelint-config-recommended": "^9.0.0",
"tar": "^6.1.2"
}
}