Sync upstream 20251218

.dockerignore

@@ -4,4 +4,8 @@ Dockerfile
 .gitignore
 .DS_Store
 node_modules
-.idea
+.idea
+.env
+.env.*
+scripts/seed
+scripts/seed-data.ts

.github/workflows/cd-cloud.yml

@@ -1,4 +1,4 @@
-name: Create docker images
+name: Create docker images (cloud)
 
 on:
   push:

.github/workflows/cd.yml

@@ -1,11 +1,24 @@
 name: Create docker images
 
-on: [create]
+on:
+  push:
+    tags:
+      - "v*.*.*"
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Optional image version (e.g. 3.0.0, v3.0.0, or 3.0.0-beta.1)"
+        required: false
+        default: ""
+      include_latest:
+        description: "Include latest tag"
+        required: false
+        type: boolean
+        default: true
 
 jobs:
   build:
     name: Build, push, and deploy
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     runs-on: ubuntu-latest
 
     strategy:
@@ -35,7 +48,5 @@ jobs:
           tags: ${{ env.tag_major }}, ${{ env.tag_minor }}, ${{ env.tag_patch }}, ${{ env.tag_latest }}
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: ghcr.io
-          multiPlatform: true
-          platform: linux/amd64,linux/arm64
           username: ${{ github.actor }}
           password: ${{ secrets.CR_PAT }}

.github/workflows/ci.yml

@@ -1,34 +1,28 @@
-# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
 name: Node.js CI
 
 on: [push]
 
 env:
-  DATABASE_TYPE: postgresql
+  DATABASE_URL: "postgresql://user:pass@localhost:5432/dummy"
   SKIP_DB_CHECK: 1
 
 jobs:
   build:
+    if: github.repository == 'umami-software/umami'
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        include:
-        - node-version: 18.18
-          db-type: postgresql
-
     steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
-      env:
-        DATABASE_TYPE: ${{ matrix.db-type }}
-    - run: npm install --global yarn
-    - run: yarn install
-    - run: yarn test
-    - run: yarn build
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10
+          run_install: false
+      - name: Use Node.js 18.18
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.18
+          cache: "pnpm"
+      - run: npm install --global pnpm
+      - run: pnpm install
+      - run: pnpm test
+      - run: pnpm build

.gitignore

@@ -4,21 +4,23 @@
 node_modules
 .pnp
 .pnp.js
+.pnpm-store
+package-lock.json
 
 # testing
 /coverage
 
 # next.js
-/.next/
-/out/
-/prisma/
-/src/generated/
+/.next
+/out
 
 # production
 /build
 /public/script.js
 /geo
 /dist
+/generated
+/src/generated
 
 # misc
 .DS_Store

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged

.stylelintrc.json

@@ -1,11 +1,6 @@
 {
-  "extends": [
-    "stylelint-config-recommended",
-    "stylelint-config-css-modules",
-    "stylelint-config-prettier"
-  ],
+  "extends": ["stylelint-config-recommended", "stylelint-config-css-modules"],
   "rules": {
     "no-descending-specificity": null
-  },
-  "ignoreFiles": ["**/*.js", "**/*.md"]
+  }
 }

Dockerfile

@@ -1,3 +1,5 @@
+ARG NODE_IMAGE_VERSION="22-alpine"
+
 # Install dependencies only when needed
 FROM node:22-alpine3.22 AS deps
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
@@ -12,21 +14,21 @@ FROM node:22-alpine3.22 AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
+COPY docker/middleware.ts ./src
 
-ARG DATABASE_TYPE
 ARG BASE_PATH
 
-ENV DATABASE_TYPE=$DATABASE_TYPE
 ENV BASE_PATH=$BASE_PATH
-
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV DATABASE_URL="postgresql://user:pass@localhost:5432/dummy"
 
 RUN npm run build-docker
 
 # Production image, copy all the files and run next
 FROM node:22-alpine3.22 AS runner
 WORKDIR /app
 
+ARG PRISMA_VERSION="6.19.0"
 ARG NODE_OPTIONS
 
 ENV NODE_ENV=production
@@ -35,29 +37,25 @@ ENV NODE_OPTIONS=$NODE_OPTIONS
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
-RUN npm install -g pnpm
-
 RUN set -x \
-    && apk add --no-cache curl
+    && apk add --no-cache curl \
+    && npm install -g pnpm
 
 # Script dependencies
-RUN pnpm add npm-run-all dotenv prisma@6.7.0
-
-# Permissions for prisma
-RUN chown -R nextjs:nodejs node_modules/.pnpm/
+RUN pnpm --allow-build='@prisma/engines' add npm-run-all dotenv chalk semver \
+    prisma@${PRISMA_VERSION} \
+    @prisma/adapter-pg@${PRISMA_VERSION}
 
 COPY --from=builder --chown=nextjs:nodejs /app/public ./public
 COPY --from=builder /app/prisma ./prisma
 COPY --from=builder /app/scripts ./scripts
+COPY --from=builder /app/generated ./generated
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 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