Merge pull request umami-software#2302 from umami-software/dev

v2.7.0
one-tab-group · Sep 23, 2023 · fd5d5c6 · fd5d5c6
2 parents a34ccbb + 2ccb8d0
commit fd5d5c6
Show file tree

Hide file tree

Showing 151 changed files with 3,610 additions and 966 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,9 +34,7 @@ yarn-error.log*
 
 # local env files
 .env
-.env.development.local
-.env.test.local
-.env.production.local
+.env.*
 
 *.dev.yml
 
diff --git a/Dockerfile b/Dockerfile
@@ -53,6 +53,7 @@ USER nextjs
 
 EXPOSE 3000
 
+ENV HOSTNAME 0.0.0.0
 ENV PORT 3000
 
 CMD ["yarn", "start-docker"]
diff --git a/db/clickhouse/schema.sql b/db/clickhouse/schema.sql
@@ -66,7 +66,7 @@ CREATE TABLE umami.website_event_queue (
 )
 ENGINE = Kafka
 SETTINGS kafka_broker_list = 'domain:9092,domain:9093,domain:9094', -- input broker list
-       kafka_topic_list = 'events',
+       kafka_topic_list = 'event',
        kafka_group_name = 'event_consumer_group',
        kafka_format = 'JSONEachRow',
        kafka_max_block_size = 1048576,

diff --git a/package.components.json b/package.components.json
@@ -1,6 +1,6 @@
 {
   "name": "@umami/components",
-  "version": "0.11.0",
+  "version": "0.1.0",
   "description": "Umami React components.",
   "author": "Mike Cao <[email protected]>",
   "license": "MIT",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Mike Cao <[email protected]>",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "check-db": "node scripts/check-db.js",
     "check-env": "node scripts/check-env.js",
     "copy-db-files": "node scripts/copy-db-files.js",
-    "extract-messages": "formatjs extract \"{pages,components}/**/*.js\" --out-file build/messages.json",
+    "extract-messages": "formatjs extract \"src/{pages,components}/**/*.js\" --out-file build/messages.json",
     "merge-messages": "node scripts/merge-messages.js",
     "generate-lang": "npm-run-all extract-messages merge-messages",
     "format-lang": "node scripts/format-lang.js",
@@ -62,10 +62,10 @@
   ],
   "dependencies": {
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.2.0",
+    "@prisma/client": "5.3.1",
     "@tanstack/react-query": "^4.33.0",
     "@umami/prisma-client": "^0.2.0",
-    "@umami/redis-client": "^0.5.0",
+    "@umami/redis-client": "^0.15.0",
     "chalk": "^4.1.1",
     "chart.js": "^4.2.1",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -91,12 +91,12 @@
     "kafkajs": "^2.1.0",
     "maxmind": "^4.3.6",
     "moment-timezone": "^0.5.35",
-    "next": "13.4.19",
+    "next": "13.5.2",
     "next-basics": "^0.36.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "react": "^18.2.0",
-    "react-basics": "^0.98.0",
+    "react-basics": "^0.100.0",
     "react-beautiful-dnd": "^13.1.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.4",
@@ -146,7 +146,7 @@
     "postcss-preset-env": "7.8.3",
     "postcss-rtlcss": "^4.0.1",
     "prettier": "^2.6.2",
-    "prisma": "5.2.0",
+    "prisma": "5.3.1",
     "prompts": "2.4.2",
     "rollup": "^3.28.0",
     "rollup-plugin-copy": "^3.4.0",

diff --git a/public/intl/messages/am-ET.json b/public/intl/messages/am-ET.json
@@ -179,6 +179,12 @@
       "value": "Country"
     }
   ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
   "label.create-report": [
     {
       "type": 0,
@@ -383,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -407,6 +419,12 @@
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -425,6 +443,12 @@
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
   "label.is": [
     {
       "type": 0,
@@ -769,6 +793,12 @@
       "value": "Retention"
     }
   ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -793,6 +823,12 @@
       "value": "Screens"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,

diff --git a/public/intl/messages/ar-SA.json b/public/intl/messages/ar-SA.json
@@ -179,6 +179,12 @@
       "value": "Country"
     }
   ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
   "label.create-report": [
     {
       "type": 0,
@@ -383,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -407,6 +419,12 @@
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -425,6 +443,12 @@
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
   "label.is": [
     {
       "type": 0,
@@ -769,6 +793,12 @@
       "value": "Retention"
     }
   ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -793,6 +823,12 @@
       "value": "الشاشات"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,

diff --git a/public/intl/messages/be-BY.json b/public/intl/messages/be-BY.json
@@ -179,6 +179,12 @@
       "value": "Country"
     }
   ],
+  "label.create": [
+    {
+      "type": 0,
+      "value": "Create"
+    }
+  ],
   "label.create-report": [
     {
       "type": 0,
@@ -383,6 +389,12 @@
       "value": "Fields"
     }
   ],
+  "label.filter": [
+    {
+      "type": 0,
+      "value": "Filter"
+    }
+  ],
   "label.filter-combined": [
     {
       "type": 0,
@@ -407,6 +419,12 @@
       "value": "Funnel"
     }
   ],
+  "label.funnel-description": [
+    {
+      "type": 0,
+      "value": "Understand the conversion and drop-off rate of users."
+    }
+  ],
   "label.greater-than": [
     {
       "type": 0,
@@ -425,6 +443,12 @@
       "value": "Insights"
     }
   ],
+  "label.insights-description": [
+    {
+      "type": 0,
+      "value": "Dive deeper into your data by using segments and filters."
+    }
+  ],
   "label.is": [
     {
       "type": 0,
@@ -769,6 +793,12 @@
       "value": "Retention"
     }
   ],
+  "label.retention-description": [
+    {
+      "type": 0,
+      "value": "Measure your website stickiness by tracking how often users return."
+    }
+  ],
   "label.role": [
     {
       "type": 0,
@@ -793,6 +823,12 @@
       "value": "Экраны"
     }
   ],
+  "label.search": [
+    {
+      "type": 0,
+      "value": "Search"
+    }
+  ],
   "label.select-date": [
     {
       "type": 0,