Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Merge branch 'dev' into local-fonts
Mike Caoe8fad828ed08
diff --cc package.jsonindex 418097404,9ec40b9c4..c098dd89e--- a/package.json+++ b/package.json@@@ -56,11 -56,7 +56,11 @@@}},"dependencies": {+ "@fontsource/inter": "^4.3.0",+ "@fontsource/noto-sans-jp": "^4.3.0",+ "@fontsource/noto-sans-sc": "^4.3.0",+ "@fontsource/noto-sans-tc": "^4.3.0",- "@prisma/client": "2.21.2",+ "@prisma/client": "2.23.0","@reduxjs/toolkit": "^1.5.1","bcryptjs": "^2.4.3","chalk": "^4.1.1",diff --cc yarn.lockindex 877e0d547,dd0898937..111b8a0bc--- a/yarn.lock+++ b/yarn.lock@@@ -1135,41 -1153,22 +1153,43 @@@minimatch "^3.0.4"strip-json-comments "^3.1.1"+"@fontsource/inter@^4.3.0":+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.3.0.tgz#deb5c5d5d2ce0d8d16173a68ba1e961741ef6d30"+ integrity sha512-qtUF+Fn9vH4O7V/13kOeemEJpQfhTMxtnOJzJw3kY7SOwl1cbs4fnd9QnQOczU3AVBJEPF1ik639uvaOg7g43A==++"@fontsource/noto-sans-jp@^4.3.0":+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/@fontsource/noto-sans-jp/-/noto-sans-jp-4.3.0.tgz#e1a715f24e199d9bd8a9e14e7fffea24cbd228b2"+ integrity sha512-EbPYK7/08Qll9SR+BvX23y4+v/uH+wJmblIQKRT76f7OZotIIbX3Sx7QGImhEidhPh4LpRdpQYJPnCw6UxtD6A==++"@fontsource/noto-sans-sc@^4.3.0":+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/@fontsource/noto-sans-sc/-/noto-sans-sc-4.3.0.tgz#fa720aef0cc9396ae37dc6c488d2301ae6719455"+ integrity sha512-AqtGDzgX5mFEe3eLMvawqHOOcr3HKg2ExXip5h7PTnKUP7pJynIhRtpDjJgNeWNocamX8fQhiXtf1EW1IqIgDQ==++"@fontsource/noto-sans-tc@^4.3.0":+ version "4.3.0"+ resolved "https://registry.yarnpkg.com/@fontsource/noto-sans-tc/-/noto-sans-tc-4.3.0.tgz#68037d03f4de203f6ed8246562301b12b06fe665"+ integrity sha512-WjCk+II1TPcd749w+o1as4DQXtg/mOXA3y9/cIE+iU6f8Knt1eOlvH7akfMwtjN0PmtaUcMHWe2HqI6gZNDjeQ==+- "@formatjs/cli@^2.13.16":- version "2.13.16"- resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-2.13.16.tgz#1664e17d0671623ffbbd1bcdcbf4a84f2de429fd"- integrity sha512-Z60xC4B0sHQZ3G2LYA5wGSuE5LXn09MLr5AY8ZL0dngJeHuoRnpMjdlj5k0Z5n2DreVWNeYQ0QaWkpuqxE307w==+ "@formatjs/cli@^4.2.15":+ version "4.2.15"+ resolved "https://registry.yarnpkg.com/@formatjs/cli/-/cli-4.2.15.tgz#1546c504fb608a36ad1d819be812786533d690f9"+ integrity sha512-B8fMtNMJViBRocRPlt9iPzuJa5/wadVHj0tySITGXQd9T1SyijuBMlxHRWrq4jyx6wZSIN5AwapWZkeHMZQ9YA==++dependencies:- "@formatjs/ts-transformer" "2.12.11"+ "@formatjs/icu-messageformat-parser" "2.0.3"+ "@formatjs/ts-transformer" "3.3.14""@types/json-stable-stringify" "^1.0.32""@types/lodash" "^4.14.150"- "@types/loud-rejection" "^2.0.0""@types/node" "14"+ "@vue/compiler-core" "^3.0.0"+ "@vue/compiler-sfc" "^3.0.5"chalk "^4.0.0"- commander "^6.1.0"+ commander "7"fast-glob "^3.2.4"fs-extra "^9.0.0"- intl-messageformat-parser "6.1.0"json-stable-stringify "^1.0.1"lodash "^4.17.15"loud-rejection "^2.2.0"