Skip to content

Commit 87a0378

Browse files
mikecaomikecao
authored
Merge pull request #2794 from umami-software/dev
v2.12.0
2 parents 7a75639 + 2969435 commit 87a0378

304 files changed

Lines changed: 16024 additions & 2324 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 83 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,93 @@
1-
# umami
1+
<p align="center">
2+
<img src="https://umami.is/images/umami-logo.png" alt="Umami Logo" width="100">
3+
</p>
24

3-
Umami is a simple, fast, privacy-focused alternative to Google Analytics.
5+
<h1 align="center">Umami</h1>
46

5-
## Getting started
7+
<p align="center">
8+
<i>Umami is a simple, fast, privacy-focused alternative to Google Analytics.</i>
9+
</p>
610

7-
A detailed getting started guide can be found at [https://umami.is/docs/](https://umami.is/docs/)
11+
<p align="center">
12+
<a href="https://github.com/umami-software/umami/releases">
13+
<img src="https://img.shields.io/github/release/umami-software/umami.svg" alt="GitHub Release" />
14+
</a>
15+
<a href="https://github.com/umami-software/umami/blob/master/LICENSE">
16+
<img src="https://img.shields.io/github/license/umami-software/umami.svg" alt="MIT License" />
17+
</a>
18+
<a href="https://github.com/umami-software/umami/actions">
19+
<img src="https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml" alt="Build Status" />
20+
</a>
21+
<a href="https://analytics.umami.is/share/LGazGOecbDtaIwDr/umami.is" style="text-decoration: none;">
22+
<img src="https://img.shields.io/badge/Try%20Demo%20Now-Click%20Here-brightgreen" alt="Umami Demo" />
23+
</a>
24+
</p>
825

9-
## Installing from source
26+
---
27+
28+
## 🚀 Getting Started
29+
30+
A detailed getting started guide can be found at [umami.is/docs](https://umami.is/docs/).
31+
32+
---
33+
34+
## 🛠 Installing from Source
1035

1136
### Requirements
1237

1338
- A server with Node.js version 16.13 or newer
14-
- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [Postgresql](https://www.postgresql.org/) (minimum v12.14) databases.
39+
- A database. Umami supports [MySQL](https://www.mysql.com/) (minimum v8.0) and [PostgreSQL](https://www.postgresql.org/) (minimum v12.14) databases.
1540

1641
### Install Yarn
1742

18-
```
43+
```bash
1944
npm install -g yarn
2045
```
2146

22-
### Get the source code and install packages
47+
### Get the Source Code and Install Packages
2348

24-
```
49+
```bash
2550
git clone https://github.com/umami-software/umami.git
2651
cd umami
2752
yarn install
2853
```
2954

30-
### Configure umami
55+
### Configure Umami
3156

32-
Create an `.env` file with the following
57+
Create an `.env` file with the following:
3358

34-
```
59+
```bash
3560
DATABASE_URL=connection-url
3661
```
3762

38-
The connection url is in the following format:
63+
The connection URL format:
3964

40-
```
65+
```bash
4166
postgresql://username:mypassword@localhost:5432/mydb
42-
4367
mysql://username:mypassword@localhost:3306/mydb
4468
```
4569

46-
### Build the application
70+
### Build the Application
4771

4872
```bash
4973
yarn build
5074
```
5175

52-
The build step will also create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.
76+
*The build step will create tables in your database if you are installing for the first time. It will also create a login user with username **admin** and password **umami**.*
5377

54-
### Start the application
78+
### Start the Application
5579

5680
```bash
5781
yarn start
5882
```
5983

60-
By default this will launch the application on `http://localhost:3000`. You will need to either
61-
[proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server
62-
or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.
84+
*By default, this will launch the application on `http://localhost:3000`. You will need to either [proxy](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) requests from your web server or change the [port](https://nextjs.org/docs/api-reference/cli#production) to serve the application directly.*
6385

64-
## Installing with Docker
86+
---
6587

66-
To build the umami container and start up a Postgres database, run:
88+
## 🐳 Installing with Docker
89+
90+
To build the Umami container and start up a Postgres database, run:
6791

6892
```bash
6993
docker compose up -d
@@ -81,7 +105,9 @@ Or with MySQL support:
81105
docker pull docker.umami.is/umami-software/umami:mysql-latest
82106
```
83107

84-
## Getting updates
108+
---
109+
110+
## 🔄 Getting Updates
85111

86112
To get the latest features, simply do a pull, install any new dependencies, and rebuild:
87113

@@ -98,7 +124,36 @@ docker compose pull
98124
docker compose up --force-recreate
99125
```
100126

101-
## License
102-
103-
MIT
104-
127+
---
128+
129+
## 🛟 Support
130+
131+
<p align="center">
132+
<a href="https://github.com/umami-software/umami">
133+
<img src="https://img.shields.io/badge/GitHub--blue?style=social&logo=github" alt="GitHub" />
134+
</a>
135+
<a href="https://twitter.com/umami_software">
136+
<img src="https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter" alt="Twitter" />
137+
</a>
138+
<a href="https://linkedin.com/company/umami-software">
139+
<img src="https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin" alt="LinkedIn" />
140+
</a>
141+
<a href="https://umami.is/discord">
142+
<img src="https://img.shields.io/badge/Discord--blue?style=social&logo=discord" alt="Discord" />
143+
</a>
144+
</p>
145+
146+
[release-shield]: https://img.shields.io/github/release/umami-software/umami.svg
147+
[releases-url]: https://github.com/umami-software/umami/releases
148+
[license-shield]: https://img.shields.io/github/license/umami-software/umami.svg
149+
[license-url]: https://github.com/umami-software/umami/blob/master/LICENSE
150+
[build-shield]: https://img.shields.io/github/actions/workflow/status/umami-software/umami/ci.yml
151+
[build-url]: https://github.com/umami-software/umami/actions
152+
[github-shield]: https://img.shields.io/badge/GitHub--blue?style=social&logo=github
153+
[github-url]: https://github.com/umami-software/umami
154+
[twitter-shield]: https://img.shields.io/badge/Twitter--blue?style=social&logo=twitter
155+
[twitter-url]: https://twitter.com/umami_software
156+
[linkedin-shield]: https://img.shields.io/badge/LinkedIn--blue?style=social&logo=linkedin
157+
[linkedin-url]: https://linkedin.com/company/umami-software
158+
[discord-shield]: https://img.shields.io/badge/Discord--blue?style=social&logo=discord
159+
[discord-url]: https://discord.com/invite/4dz4zcXYrQ

‎next.config.js‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ require('dotenv').config();
33
const path = require('path');
44
const pkg = require('./package.json');
55

6-
const basePath = process.env.BASE_PATH || '';
7-
const forceSSL = process.env.FORCE_SSL || '';
8-
const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT || '';
9-
const defaultLocale = process.env.DEFAULT_LOCALE || '';
10-
const trackerScriptName = process.env.TRACKER_SCRIPT_NAME || '';
11-
const cloudMode = process.env.CLOUD_MODE || '';
12-
const cloudUrl = process.env.CLOUD_URL || '';
13-
const frameAncestors = process.env.ALLOWED_FRAME_URLS || '';
14-
const disableLogin = process.env.DISABLE_LOGIN || '';
15-
const disableUI = process.env.DISABLE_UI || '';
16-
const hostURL = process.env.HOST_URL || '';
17-
const privateMode = process.env.PRIVATE_MODE || '';
6+
const basePath = process.env.BASE_PATH;
7+
const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT;
8+
const cloudMode = process.env.CLOUD_MODE;
9+
const cloudUrl = process.env.CLOUD_URL;
10+
const defaultLocale = process.env.DEFAULT_LOCALE;
11+
const disableLogin = process.env.DISABLE_LOGIN;
12+
const disableUI = process.env.DISABLE_UI;
13+
const forceSSL = process.env.FORCE_SSL;
14+
const frameAncestors = process.env.ALLOWED_FRAME_URLS;
15+
const privateMode = process.env.PRIVATE_MODE;
16+
const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
1817

1918
const contentSecurityPolicy = [
2019
`default-src 'self'`,
@@ -120,7 +119,6 @@ const config = {
120119
defaultLocale,
121120
disableLogin,
122121
disableUI,
123-
hostURL,
124122
privateMode,
125123
},
126124
basePath,
@@ -169,6 +167,10 @@ const config = {
169167
source: '/telemetry.js',
170168
destination: '/api/scripts/telemetry',
171169
},
170+
{
171+
source: '/teams/:teamId/:path*',
172+
destination: '/:path*',
173+
},
172174
];
173175
},
174176
async redirects() {

‎package.components.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"@tanstack/react-query": "^4.33.0",
1212
"classnames": "^2.3.1",
1313
"colord": "^2.9.2",
14+
"date-fns-tz": "^1.1.4",
1415
"immer": "^9.0.12",
1516
"moment-timezone": "^0.5.35",
1617
"next": "^13.4.0",

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "umami",
3-
"version": "2.11.3",
3+
"version": "2.12.0",
44
"description": "A simple, fast, privacy-focused alternative to Google Analytics.",
55
"author": "Umami Software, Inc. <hello@umami.is>",
66
"license": "MIT",
@@ -64,14 +64,14 @@
6464
".next/cache"
6565
],
6666
"dependencies": {
67-
"@clickhouse/client": "^0.2.2",
67+
"@clickhouse/client": "^1.0.2",
6868
"@fontsource/inter": "^4.5.15",
69-
"@prisma/client": "5.12.1",
69+
"@prisma/client": "5.14.0",
7070
"@prisma/extension-read-replicas": "^0.3.0",
7171
"@react-spring/web": "^9.7.3",
7272
"@tanstack/react-query": "^5.28.6",
7373
"@umami/prisma-client": "^0.14.0",
74-
"@umami/redis-client": "^0.20.0",
74+
"@umami/redis-client": "^0.21.0",
7575
"chalk": "^4.1.1",
7676
"chart.js": "^4.4.2",
7777
"chartjs-adapter-date-fns": "^3.0.0",
@@ -98,11 +98,11 @@
9898
"maxmind": "^4.3.6",
9999
"md5": "^2.3.0",
100100
"moment-timezone": "^0.5.35",
101-
"next": "14.1.4",
101+
"next": "14.2.3",
102102
"next-basics": "^0.39.0",
103103
"node-fetch": "^3.2.8",
104104
"npm-run-all": "^4.1.5",
105-
"prisma": "5.12.1",
105+
"prisma": "5.14.0",
106106
"react": "^18.2.0",
107107
"react-basics": "^0.123.0",
108108
"react-beautiful-dnd": "^13.1.0",

0 commit comments

Comments
 (0)