watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-08 05:12:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source
This commit is contained in:
Francis Cao 2023-04-18 12:45:08 -07:00
commit 16ece9ad64
27 changed files with 3172 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/check-db.js
View file

@ -50,7 +50,7 @@ async function checkConnection() {
}
async function checkDatabaseVersion(databaseType) {
const query = await prisma.$queryRaw`select version() version`;
const query = await prisma.$queryRaw`select version() as version`;
const version = semver.valid(semver.coerce(query[0].version));
const minVersion = databaseType === 'postgresql' ? '9.4.0' : '5.7.0';

2
scripts/update-tracker.js
View file

@ -6,7 +6,7 @@ const path = require('path');
const endPoint = process.env.COLLECT_API_ENDPOINT;
if (endPoint) {
const file = path.resolve(__dirname, '../public/umami.js');
const file = path.resolve(__dirname, '../public/script.js');
const tracker = fs.readFileSync(file);