Merge remote-tracking branch 'refs/remotes/origin/main'

acdh-oeaw · Jan 13, 2025 · d0f3e7c · d0f3e7c
2 parents 84a0a87 + 2a0c884
commit d0f3e7c
Show file tree

Hide file tree

Showing 9 changed files with 159 additions and 72 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Astro",
-	"image": "ghcr.io/acdh-oeaw/devcontainer-frontend:20",
+	"image": "ghcr.io/acdh-oeaw/devcontainer-frontend:22",
 	"customizations": {
 		"vscode": {
 			"extensions": [

diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -75,8 +75,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: node_modules/.astro/
-          key: ${{ runner.os }}-astro-20.x-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-astro-20.x
+          key: ${{ runner.os }}-astro-22.x-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-astro-22.x
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node-version: [20.x]
+        node-version: [22.x]
         os: [ubuntu-latest]
 
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@
 # @see https://sharp.pixelplumbing.com/install#linux-memory-allocator
 
 # base
-FROM node:20-alpine AS base
+FROM node:22-alpine AS base
 
 RUN corepack enable
 
@@ -56,7 +56,7 @@ RUN --mount=type=secret,id=KEYSTATIC_GITHUB_CLIENT_ID,uid=1000 \
 		pnpm run build
 
 # serve
-FROM node:20-alpine AS serve
+FROM node:22-alpine AS serve
 
 RUN mkdir /app && chown -R node:node /app
 WORKDIR /app

diff --git a/Dockerfile.static b/Dockerfile.static
@@ -4,7 +4,7 @@
 # @see https://sharp.pixelplumbing.com/install#linux-memory-allocator
 
 # build
-FROM node:20-alpine AS build
+FROM node:22-alpine AS build
 
 RUN corepack enable
 

diff --git a/....ts-snapshots/imprint-page-should-not-have-visible-changes-1-chromium-linux.png b/....ts-snapshots/imprint-page-should-not-have-visible-changes-1-chromium-linux.png
diff --git a/package.json b/package.json
@@ -4,10 +4,10 @@
 	"license": "MIT",
 	"type": "module",
 	"engines": {
-		"node": "20.x",
+		"node": "22.x",
 		"pnpm": "9.x"
 	},
-	"packageManager": "pnpm@9.4.0",
+	"packageManager": "pnpm@9.12.3",
 	"scripts": {
 		"build": "run-s build:site generate:search-index",
 		"build:site": "astro build",
@@ -53,7 +53,7 @@
 		"@shikijs/rehype": "^1.7.0",
 		"astro": "^4.11.0",
 		"astro-icon": "^1.1.0",
-		"cva": "^1.0.0-beta.1",
+		"cva": "1.0.0-beta.1",
 		"date-fns": "^3.6.0",
 		"estree-util-value-to-estree": "^3.1.1",
 		"hast-util-heading-rank": "^3.0.0",
@@ -94,7 +94,7 @@
 		"@playwright/test": "^1.44.1",
 		"@types/hast": "^3.0.4",
 		"@types/mdx": "^2.0.13",
-		"@types/node": "^20.14.6",
+		"@types/node": "^22.9.0",
 		"@types/nodemailer": "^6.4.15",
 		"@types/pdfkit": "^0.13.4",
 		"@types/react": "^18.3.3",