Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Updated lang files.

Mike Cao3e163940da56
diff --cc docker/middleware.ts
index ae143140d,000000000..3fd7f20e3
mode 100644,000000..100644
--- a/docker/middleware.ts
+++ b/docker/middleware.ts
@@@ -1,69 -1,0 +1,78 @@@
+import { NextRequest, NextResponse } from 'next/server';
+
+export const config = {
+ matcher: '/:path*',
+};
+
- const TRACKER_NAME = '/script.js';
- const COLLECT_ENDPOINT = '/api/send';
++const TRACKER_PATH = '/script.js';
++const COLLECT_PATH = '/api/send';
++const LOGIN_PATH = '/login';
+
+const apiHeaders = {
+ 'Access-Control-Allow-Origin': '*',
+ 'Access-Control-Allow-Headers': '*',
+ 'Access-Control-Allow-Methods': 'GET, DELETE, POST, PUT',
+ 'Access-Control-Max-Age': process.env.CORS_MAX_AGE || '86400',
+ 'Cache-Control': 'no-cache',
+};
+
+const trackerHeaders = {
+ 'Access-Control-Allow-Origin': '*',
+ 'Cache-Control': 'public, max-age=86400, must-revalidate',
+};
+
+function customCollectEndpoint(request: NextRequest) {
+ const collectEndpoint = process.env.COLLECT_API_ENDPOINT;
+
+ if (collectEndpoint) {
+ const url = request.nextUrl.clone();
+
+ if (url.pathname.endsWith(collectEndpoint)) {
- url.pathname = COLLECT_ENDPOINT;
++ url.pathname = COLLECT_PATH;
+ return NextResponse.rewrite(url, { headers: apiHeaders });
+ }
+ }
+}
+
+function customScriptName(request: NextRequest) {
+ const scriptName = process.env.TRACKER_SCRIPT_NAME;
+
+ if (scriptName) {
+ const url = request.nextUrl.clone();
+ const names = scriptName.split(',').map(name => name.trim().replace(/^\/+/, ''));
+
+ if (names.find(name => url.pathname.endsWith(name))) {
- url.pathname = TRACKER_NAME;
++ url.pathname = TRACKER_PATH;
+ return NextResponse.rewrite(url, { headers: trackerHeaders });
+ }
+ }
+}
+
+function customScriptUrl(request: NextRequest) {
+ const scriptUrl = process.env.TRACKER_SCRIPT_URL;
+
- if (scriptUrl && request.nextUrl.pathname.endsWith(TRACKER_NAME)) {
++ if (scriptUrl && request.nextUrl.pathname.endsWith(TRACKER_PATH)) {
+ return NextResponse.rewrite(scriptUrl, { headers: trackerHeaders });
+ }
+}
+
++function disableLogin(request: NextRequest) {
++ const loginDisabled = process.env.DISABLE_LOGIN;
++
++ if (loginDisabled && request.nextUrl.pathname.endsWith(LOGIN_PATH)) {
++ return new NextResponse('Access denied', { status: 403 });
++ }
++}
++
+export default function middleware(req: NextRequest) {
- const fns = [customCollectEndpoint, customScriptName, customScriptUrl];
++ const fns = [customCollectEndpoint, customScriptName, customScriptUrl, disableLogin];
+
+ for (const fn of fns) {
+ const res = fn(req);
+ if (res) {
+ return res;
+ }
+ }
+
+ return NextResponse.next();
+}
diff --cc next.config.ts
index 6fac599e4,7f4020084..e4fe228cf
--- a/next.config.ts
+++ b/next.config.ts
@@@ -3,25 -6,25 +3,25 @@@ import pkg from './package.json' asser
const TRACKER_SCRIPT = '/script.js';
-const basePath = process.env.BASE_PATH;
-const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT;
-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 forceSSL = process.env.FORCE_SSL;
-const frameAncestors = process.env.ALLOWED_FRAME_URLS ?? '';
-const trackerScriptName = process.env.TRACKER_SCRIPT_NAME;
-const trackerScriptURL = process.env.TRACKER_SCRIPT_URL;
-
-const contentSecurityPolicy = [
- `default-src 'self'`,
- `img-src * data:`,
- `script-src 'self' 'unsafe-eval' 'unsafe-inline'`,
- `style-src 'self' 'unsafe-inline'`,
- `connect-src 'self' api.umami.is cloud.umami.is`,
- `frame-ancestors 'self' ${frameAncestors}`,
-];
+const basePath = process.env.BASE_PATH || '';
+const cloudMode = process.env.CLOUD_MODE || '';
+const cloudUrl = process.env.CLOUD_URL || '';
+const collectApiEndpoint = process.env.COLLECT_API_ENDPOINT || '';
+const corsMaxAge = process.env.CORS_MAX_AGE || '';
+const defaultLocale = process.env.DEFAULT_LOCALE || '';
+const forceSSL = process.env.FORCE_SSL || '';
+const frameAncestors = process.env.ALLOWED_FRAME_URLS || '';
+const trackerScriptName = process.env.TRACKER_SCRIPT_NAME || '';
+const trackerScriptURL = process.env.TRACKER_SCRIPT_URL || '';
+
+const contentSecurityPolicy = `
+ default-src 'self';
+ img-src 'self' https: data:;
+ script-src 'self' 'unsafe-eval' 'unsafe-inline';
+ style-src 'self' 'unsafe-inline';
- connect-src *;
++ connect-src 'self' https:;
+ frame-ancestors 'self' ${frameAncestors};
+`;
const defaultHeaders = [
{
diff --cc public/intl/messages/en-US.json
index 5cc8c37ee,76a68dba1..cdb78cd4e
--- a/public/intl/messages/en-US.json
+++ b/public/intl/messages/en-US.json
@@@ -524,7 -404,7 +524,7 @@@
"label.entry": [
{
"type": 0,
-- "value": "Entry path"
++ "value": "Entry page"
}
],
"label.event": [
@@@ -560,7 -428,7 +560,7 @@@
"label.exit": [
{
"type": 0,
-- "value": "Exit path"
++ "value": "Exit page"
}
],
"label.false": [
diff --cc scripts/format-lang.js
index 0230bda35,593e296d2..ad18d82d6
--- a/scripts/format-lang.js
+++ b/scripts/format-lang.js
@@@ -1,12 -1,10 +1,11 @@@
-const fs = require('fs-extra');
-const path = require('path');
-const del = require('del');
-const prettier = require('prettier');
-
-const src = path.resolve(__dirname, '../src/lang');
-const dest = path.resolve(__dirname, '../build/messages');
+import path from 'node:path';
+import fs from 'fs-extra';
+import del from 'del';
- import prettier from 'prettier';
+import { createRequire } from 'module';
+
+const require = createRequire(import.meta.url);
+const src = path.resolve(process.cwd(), 'src/lang');
+const dest = path.resolve(process.cwd(), 'build/messages');
const files = fs.readdirSync(src);
del.sync([path.join(dest)]);
@@@ -27,7 -25,7 +26,7 @@@ async function run()
return obj;
}, {});
-- const json = prettier.format(JSON.stringify(formatted), { parser: 'json' });
++ const json = JSON.stringify(formatted, null, 2);
fs.writeFileSync(path.resolve(dest, file), json);
});