Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Merge branch 'master' into umami-import

Edward Cui2b5dce964866
diff --cc server/package-lock.json
index 78f9448a9,cf1a563ca..2f655c25a
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@@ -9,11 -9,9 +9,12 @@@
"version": "1.5.1",
"dependencies": {
"@aws-sdk/client-s3": "^3.842.0",
+ "@aws-sdk/lib-storage": "^3.850.0",
+ "@axiomhq/pino": "^1.3.1",
"@clickhouse/client": "1.11.1",
+ "@fast-csv/parse": "^5.0.2",
"@fastify/cors": "11.0.1",
+ "@fastify/multipart": "^9.0.3",
"@fastify/one-line-logger": "2.0.2",
"@fastify/rate-limit": "^10.3.0",
"@fastify/static": "8.1.1",
diff --cc server/package.json
index 4cd9e6b05,00de631d1..8c99344c4
--- a/server/package.json
+++ b/server/package.json
@@@ -22,11 -22,9 +22,12 @@@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.842.0",
+ "@aws-sdk/lib-storage": "^3.850.0",
+ "@axiomhq/pino": "^1.3.1",
"@clickhouse/client": "1.11.1",
+ "@fast-csv/parse": "^5.0.2",
"@fastify/cors": "11.0.1",
+ "@fastify/multipart": "^9.0.3",
"@fastify/one-line-logger": "2.0.2",
"@fastify/rate-limit": "^10.3.0",
"@fastify/static": "8.1.1",