watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'dev' into jajaja

Browse source 
# Conflicts:
#	next.config.ts
#	src/app/(main)/settings/preferences/LanguageSetting.tsx
#	src/components/hooks/useConfig.ts
This commit is contained in:
Mike Cao 2025-07-27 02:11:32 -07:00
commit b552868e0a
14 changed files with 55 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

20
next.config.ts
View file

@ -13,12 +13,8 @@ const cloudMode = process.env.CLOUD_MODE;
const cloudUrl = process.env.CLOUD_URL;
const corsMaxAge = process.env.CORS_MAX_AGE;
const defaultLocale = process.env.DEFAULT_LOCALE;
const disableLogin = process.env.DISABLE_LOGIN;
const disableUI = process.env.DISABLE_UI;
const faviconURL = process.env.FAVICON_URL;
const forceSSL = process.env.FORCE_SSL;
const frameAncestors = process.env.ALLOWED_FRAME_URLS ?? '';
const privateMode = process.env.PRIVATE_MODE;
const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
const trackerScriptURL = process.env.TRACKER_SCRIPT_URL;
@ -168,13 +164,11 @@ if (cloudMode && cloudUrl) {
permanent: false,
});
if (disableLogin) {
redirects.push({
source: '/login',
destination: cloudUrl,
permanent: false,
});
}
redirects.push({
source: '/login',
destination: cloudUrl,
permanent: false,
});
}
/** @type {import('next').NextConfig} */
@ -186,10 +180,6 @@ export default {
cloudUrl,
currentVersion: pkg.version,
defaultLocale,
disableLogin,
disableUI,
faviconURL,
privateMode,
},
basePath,
output: 'standalone',