Upgraded react. Fixed docker build.

Author: mikecao

Dockerfile

@@ -12,6 +12,7 @@ FROM node:22-alpine AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
+COPY docker/middleware.ts ./src
 
 ARG DATABASE_TYPE
 ARG BASE_PATH
@@ -55,9 +56,6 @@ COPY --from=builder /app/scripts ./scripts
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
-# Custom routes
-RUN mv ./.next/routes-manifest.json ./.next/routes-manifest-orig.json
-
 USER nextjs
 
 EXPOSE 3000

docker/middleware.ts

@@ -0,0 +1,78 @@
+import { type NextRequest, NextResponse } from 'next/server';
+
+export const config = {
+  matcher: '/:path*',
+};
+
+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_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_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_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, disableLogin];
+
+  for (const fn of fns) {
+    const res = fn(req);
+    if (res) {
+      return res;
+    }
+  }
+
+  return NextResponse.next();
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "description": "A modern, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <[email protected]>",
   "license": "MIT",
@@ -15,7 +15,7 @@
     "build": "npm-run-all check-env build-db check-db build-tracker build-geo build-app",
     "start": "next start",
     "build-docker": "npm-run-all build-db build-tracker build-geo build-app",
-    "start-docker": "npm-run-all check-db update-tracker set-routes-manifest start-server",
+    "start-docker": "npm-run-all check-db update-tracker start-server",
     "start-env": "node scripts/start-env.js",
     "start-server": "node server.js",
     "build-app": "next build",
@@ -26,7 +26,6 @@
     "build-geo": "node scripts/build-geo.js",
     "build-db-schema": "prisma db pull",
     "build-db-client": "prisma generate",
-    "set-routes-manifest": "node scripts/set-routes-manifest.js",
     "update-tracker": "node scripts/update-tracker.js",
     "update-db": "prisma migrate deploy",
     "check-db": "node scripts/check-db.js",
@@ -110,9 +109,9 @@
     "papaparse": "^5.5.3",
     "prisma": "6.7.0",
     "pure-rand": "^6.1.0",
-    "react": "^19.0.0",
+    "react": "^19.2.1",
     "react-basics": "^0.126.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^19.2.1",
     "react-error-boundary": "^4.0.4",
     "react-intl": "^6.5.5",
     "react-simple-maps": "^2.3.0",