Merge branch 'dev' of https://github.com/umami-software/umami into dev
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user