Merge pull request #3242 from umami-software/analytics

v2.16

Author: mikecao

.eslintrc.json

@@ -13,13 +13,6 @@
     "ecmaVersion": 11,
     "sourceType": "module"
   },
-  "settings": {
-    "import/resolver": {
-      "node": {
-        "moduleDirectory": ["node_modules", "src/"]
-      }
-    }
-  },
   "extends": [
     "plugin:@typescript-eslint/recommended",
     "eslint:recommended",

Dockerfile

@@ -1,5 +1,5 @@
 # Install dependencies only when needed
-FROM node:18-alpine AS deps
+FROM node:22-alpine AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 WORKDIR /app
@@ -9,7 +9,7 @@ RUN yarn config set network-timeout 300000
 RUN yarn install --frozen-lockfile
 
 # Rebuild the source code only when needed
-FROM node:18-alpine AS builder
+FROM node:22-alpine AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
@@ -26,18 +26,21 @@ ENV NEXT_TELEMETRY_DISABLED 1
 RUN yarn build-docker
 
 # Production image, copy all the files and run next
-FROM node:18-alpine AS runner
+FROM node:22-alpine AS runner
 WORKDIR /app
 
+ARG NODE_OPTIONS
+
 ENV NODE_ENV production
 ENV NEXT_TELEMETRY_DISABLED 1
+ENV NODE_OPTIONS $NODE_OPTIONS
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
 RUN set -x \
-    && apk add --no-cache curl openssl \
-    && yarn add npm-run-all dotenv semver prisma@5.17.0
+    && apk add --no-cache curl \
+    && yarn add npm-run-all dotenv semver prisma@6.1.0
 
 # You only need to copy next.config.js if you are NOT using the default configuration
 COPY --from=builder /app/next.config.js .

db/mysql/schema.prisma

@@ -1,6 +1,6 @@
 generator client {
   provider      = "prisma-client-js"
-  binaryTargets = ["native", "linux-musl-openssl-3.0.x", "linux-musl-arm64-openssl-3.0.x"]
+  binaryTargets = ["native"]
 }
 
 datasource db {

db/postgresql/schema.prisma

@@ -1,6 +1,6 @@
 generator client {
   provider      = "prisma-client-js"
-  binaryTargets = ["native", "linux-musl-openssl-3.0.x", "linux-musl-arm64-openssl-3.0.x"]
+  binaryTargets = ["native"]
 }
 
 datasource db {

next-env.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

next.config.js

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 require('dotenv').config();
-const path = require('path');
 const pkg = require('./package.json');
 
 const TRACKER_SCRIPT = '/script.js';
@@ -9,6 +8,7 @@ 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 disableLogin = process.env.DISABLE_LOGIN;
 const disableUI = process.env.DISABLE_UI;
@@ -60,6 +60,15 @@ const trackerHeaders = [
 ];
 
 const headers = [
+  {
+    source: '/api/:path*',
+    headers: [
+      { key: 'Access-Control-Allow-Origin', value: '*' },
+      { key: 'Access-Control-Allow-Headers', value: '*' },
+      { key: 'Access-Control-Allow-Methods', value: 'GET, DELETE, POST, PUT' },
+      { key: 'Access-Control-Max-Age', value: corsMaxAge || '86400' },
+    ],
+  },
   {
     source: '/:path*',
     headers: defaultHeaders,
@@ -169,27 +178,22 @@ const config = {
   typescript: {
     ignoreBuildErrors: true,
   },
-  webpack(config) {
-    const fileLoaderRule = config.module.rules.find(rule => rule.test?.test?.('.svg'));
-
-    config.module.rules.push(
-      {
-        ...fileLoaderRule,
-        test: /\.svg$/i,
-        resourceQuery: /url/,
-      },
-      {
-        test: /\.svg$/i,
-        issuer: fileLoaderRule.issuer,
-        resourceQuery: { not: [...fileLoaderRule.resourceQuery.not, /url/] },
-        use: ['@svgr/webpack'],
+  experimental: {
+    turbo: {
+      rules: {
+        '*.svg': {
+          loaders: ['@svgr/webpack'],
+          as: '*.js',
+        },
       },
-    );
-
-    fileLoaderRule.exclude = /\.svg$/i;
-
-    config.resolve.alias['public'] = path.resolve('./public');
-
+    },
+  },
+  webpack(config) {
+    config.module.rules.push({
+      test: /\.svg$/,
+      issuer: /\.(js|ts)x?$/,
+      use: ['@svgr/webpack'],
+    });
     return config;
   },
   async headers() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "2.15.1",
+  "version": "2.16.0",
   "description": "A simple, fast, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
@@ -10,7 +10,7 @@
     "url": "https://github.com/umami-software/umami.git"
   },
   "scripts": {
-    "dev": "next dev -p 3000",
+    "dev": "next dev -p 3000 --turbo",
     "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",
@@ -63,21 +63,20 @@
   "cacheDirectories": [
     ".next/cache"
   ],
-  "resolutions": {
-    "jackspeak": "2.1.1"
-  },
   "dependencies": {
-    "@clickhouse/client": "^1.4.1",
+    "@clickhouse/client": "^1.10.1",
     "@date-fns/utc": "^1.2.0",
     "@dicebear/collection": "^9.2.1",
     "@dicebear/core": "^9.2.1",
     "@fontsource/inter": "^4.5.15",
-    "@prisma/client": "5.22.0",
-    "@prisma/extension-read-replicas": "^0.3.0",
+    "@hello-pangea/dnd": "^17.0.0",
+    "@prisma/client": "6.1.0",
+    "@prisma/extension-read-replicas": "^0.4.0",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^5.28.6",
     "@umami/prisma-client": "^0.14.0",
-    "@umami/redis-client": "^0.24.0",
+    "@umami/redis-client": "^0.26.0",
+    "bcryptjs": "^2.4.3",
     "chalk": "^4.1.1",
     "chart.js": "^4.4.2",
     "chartjs-adapter-date-fns": "^3.0.0",
@@ -99,17 +98,17 @@
     "is-docker": "^3.0.0",
     "is-localhost-ip": "^1.4.0",
     "isbot": "^5.1.16",
+    "jsonwebtoken": "^9.0.2",
     "kafkajs": "^2.1.0",
-    "maxmind": "^4.3.6",
+    "maxmind": "^4.3.24",
     "md5": "^2.3.0",
     "next": "15.0.4",
-    "next-basics": "^0.39.0",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
-    "prisma": "5.22.0",
+    "prisma": "6.1.0",
+    "pure-rand": "^6.1.0",
     "react": "^19.0.0",
-    "react-basics": "^0.125.0",
-    "react-beautiful-dnd": "^13.1.0",
+    "react-basics": "^0.126.0",
     "react-dom": "^19.0.0",
     "react-error-boundary": "^4.0.4",
     "react-intl": "^6.5.5",
@@ -118,9 +117,10 @@
     "react-window": "^1.8.6",
     "request-ip": "^3.3.0",
     "semver": "^7.5.4",
+    "serialize-error": "^12.0.0",
     "thenby": "^1.3.4",
     "uuid": "^9.0.0",
-    "yup": "^0.32.11",
+    "zod": "^3.24.1",
     "zustand": "^4.5.5"
   },
   "devDependencies": {
@@ -135,15 +135,16 @@
     "@svgr/webpack": "^8.1.0",
     "@types/cypress": "^1.1.3",
     "@types/jest": "^29.5.14",
-    "@types/node": "^20.9.0",
-    "@types/react": "^18.2.41",
-    "@types/react-dom": "^18.2.17",
+    "@types/node": "^22.13.4",
+    "@types/react": "^19.0.8",
+    "@types/react-dom": "^19.0.2",
+    "@types/react-intl": "^3.0.0",
     "@types/react-window": "^1.8.8",
     "@typescript-eslint/eslint-plugin": "^6.7.3",
     "@typescript-eslint/parser": "^6.7.3",
     "cross-env": "^7.0.3",
     "cypress": "^13.6.6",
-    "esbuild": "^0.17.17",
+    "esbuild": "^0.25.0",
     "eslint": "^8.33.0",
     "eslint-config-next": "^14.0.4",
     "eslint-config-prettier": "^8.5.0",