Merge branch 'release/2.1.1'

.github/dependabot.yml

@@ -14,8 +14,8 @@ updates:
     reviewers:
       - "D3strukt0r"
     schedule:
-      interval: "daily"
-      time: "08:00"
+      interval: "weekly" # on monday
+      time: "16:00"
       timezone: "Europe/Zurich"
 
   # PWA pnpm
@@ -27,8 +27,24 @@ updates:
     reviewers:
       - "D3strukt0r"
     schedule:
-      interval: "daily"
-      time: "08:00"
+      interval: "weekly" # on monday
+      time: "16:00"
+      timezone: "Europe/Zurich"
+    groups:
+      pwa-dependencies:
+        applies-to: version-updates
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+  - package-ecosystem: "npm"
+    directory: "/pwa"
+    target-branch: "develop"
+    labels:
+      - "dependabot :robot:"
+    schedule:
+      interval: "weekly" # on monday
+      time: "16:00"
       timezone: "Europe/Zurich"
     groups:
       pwa-dependencies:

.github/workflows/ci-cd.yml

@@ -15,7 +15,7 @@ on:
       # Below should match .dockerignore
       - '.docker/rootfs/**'
 
-      - 'pwa/.docker/rootfs/**'
+      - 'pwa/.docker/rootfs-prod/**'
       - 'pwa/public/**'
       - 'pwa/src/**'
       - pwa/.browserslistrc

.vagrant.config.yml.dist

@@ -24,6 +24,8 @@ folder:
   # To avoid having to enter sudo password every time you run vagrant up,
   # follow guide on:
   # https://www.vagrantup.com/docs/synced-folders/nfs#root-privilege-requirement
+  # If there is an error with NFS (Connection reset by peer), you can try to run
+  # `sudo nfsd update` after the error, manually shutdown the VM and run `vagrant up`
   type: 'nfs'
   rsync:
     # The following directories are not synchronized via Rsync. Only used if

compose.vm.yml.dist

@@ -5,7 +5,7 @@ services:
       ssh:
         - default
       target: dev
-    init: true
+    profiles: [dev]
     container_name: pwa
     volumes:
       # Mount app directory
@@ -14,12 +14,9 @@ services:
       # Store package manager cache in vagrant
       - ~/data/pnpm:/var/cache/pnpm
 
-      # Disable nginx process and use vite dev server
-      - ./.docker/rootfs-local/empty.txt:/etc/supervisor/conf.d/nginx.conf
-      - ./pwa/.docker/rootfs-local/etc/supervisor/conf.d/vite-dev-server.conf:/etc/supervisor/conf.d/vite-dev-server.conf
-
       # Entrypoint scripts to run only locally (install deps, etc.)
-      - ./pwa/.docker/rootfs-local/docker-entrypoint.d/10_install-deps.sh:/docker-entrypoint.d/10_install-deps.sh
+      - ./pwa/.docker/rootfs-dev/usr/local/bin/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
+      - ./pwa/.docker/rootfs-dev/docker-entrypoint.d/10_install-deps.sh:/docker-entrypoint.d/10_install-deps.sh
       #- ./pwa/.docker/rootfs-local/docker-entrypoint.d/20_build.sh:/docker-entrypoint.d/20_build.sh
     depends_on:
       - traefik
@@ -29,6 +26,22 @@ services:
       traefik.http.routers.pwa.rule: Host(`weleda-webcenter-text-export.test`)
       traefik.http.routers.pwa.tls: true
 
+  pwa-prod:
+    build:
+      dockerfile: pwa.Dockerfile
+      ssh:
+        - default
+      target: prod
+    profiles: [prod]
+    container_name: pwa-prod
+    depends_on:
+      - traefik
+    labels:
+      traefik.enable: true
+      traefik.http.routers.pwa.entrypoints: websecure
+      traefik.http.routers.pwa.rule: Host(`weleda-webcenter-text-export.test`)
+      traefik.http.routers.pwa.tls: true
+
   traefik:
     image: traefik
     init: true

pwa/package.json

@@ -34,20 +34,20 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@tailwindcss/forms": "^0.5.7",
-    "@tanstack/eslint-plugin-query": "^5.43.1",
-    "@tanstack/react-query": "^5.45.1",
-    "@tanstack/react-query-devtools": "^5.45.1",
-    "@testing-library/dom": "^10.1.0",
+    "@tanstack/eslint-plugin-query": "^5.51.1",
+    "@tanstack/react-query": "^5.51.1",
+    "@tanstack/react-query-devtools": "^5.51.1",
+    "@testing-library/dom": "^10.3.2",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-    "@typescript-eslint/eslint-plugin": "^7.13.0",
-    "@typescript-eslint/parser": "^7.13.0",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@typescript-eslint/parser": "^7.16.1",
     "@vitejs/plugin-react": "^4.3.1",
     "@vitest/coverage-v8": "^1.6.0",
     "autoprefixer": "^10.4.19",
-    "browserslist": "^4.23.1",
+    "browserslist": "^4.23.2",
     "browserslist-to-esbuild": "^2.1.1",
     "clsx": "^2.1.1",
     "eslint": "^8.57.0",
@@ -57,27 +57,27 @@
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-jsx-a11y": "^6.9.0",
     "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.34.2",
+    "eslint-plugin-react": "^7.34.4",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.7",
-    "i18next": "^23.11.5",
+    "eslint-plugin-react-refresh": "^0.4.8",
+    "i18next": "^23.12.1",
     "i18next-browser-languagedetector": "^8.0.0",
     "i18next-http-backend": "^2.5.2",
     "i18next-resources-to-backend": "^1.2.1",
     "interweave": "^13.1.0",
     "jsdom": "^24.1.0",
-    "postcss": "^8.4.38",
-    "prettier": "^3.3.2",
+    "postcss": "^8.4.39",
+    "prettier": "^3.3.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-dropzone": "^14.2.3",
-    "react-i18next": "^14.1.2",
-    "react-router-dom": "^6.23.1",
-    "tailwindcss": "^3.4.4",
-    "typescript": "^5.4.5",
-    "vite": "^5.3.1",
+    "react-i18next": "^14.1.3",
+    "react-router-dom": "^6.24.1",
+    "tailwindcss": "^3.4.5",
+    "typescript": "^5.5.3",
+    "vite": "^5.3.3",
     "vite-plugin-chunk-split": "^0.5.0",
     "vite-plugin-svgr": "^4.2.0",
     "vitest": "^1.6.0"