Merge branch 'main' of github.com:digitalservicebund/a2j-rechtsantrag…

…stelle-strapi

.github/workflows/ci-pipeline.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: "18.x"
           cache: "npm"
@@ -55,7 +55,7 @@ jobs:
         run: |
           docker build -t ${{ env.IMAGE_NAME }}:${{ github.sha }} . --build-arg COMMIT_SHA=${{ github.sha }}
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@fbd16365eb88e12433951383f5e99bd901fc618f
+        uses: aquasecurity/trivy-action@2b6a709cf9c4025c5438138008beaddbb02086f0
         with:
           image-ref: "${{ env.IMAGE_NAME }}:${{ github.sha }}"
           format: "template"

package.json

@@ -12,19 +12,16 @@
     "postinstall": "patch-package"
   },
   "dependencies": {
-    "@strapi/plugin-i18n": "4.14.4",
-    "@strapi/plugin-users-permissions": "4.14.4",
-    "@strapi/provider-upload-aws-s3": "4.14.4",
-    "@strapi/strapi": "4.14.4",
+    "@strapi/plugin-i18n": "4.15.0",
+    "@strapi/plugin-users-permissions": "4.15.0",
+    "@strapi/provider-upload-aws-s3": "4.15.0",
+    "@strapi/strapi": "4.15.0",
     "patch-package": "^8.0.0",
     "pg": "^8.11.3",
     "pluralize": "^8.0.0",
-    "strapi-plugin-populate-deep": "^3.0.0",
+    "strapi-plugin-populate-deep": "^3.0.1",
     "strapi-plugin-site-publisher": "^0.1.2"
   },
-  "author": {
-    "name": "A Strapi developer"
-  },
   "strapi": {
     "uuid": "75be5f21-db3a-4a6f-9069-20b0c6b8e10c"
   },
@@ -33,13 +30,9 @@
     "npm": ">=6.0.0"
   },
   "license": "MIT",
-  "//": "We need to use qs > 6.10.3 - https://github.com/advisories/GHSA-hrpp-h998-j3pp",
-  "overrides": {
-    "qs": "^6.10.3"
-  },
   "devDependencies": {
+    "better-sqlite3": "^9.1.1",
     "jest": "^29.7.0",
-    "sqlite3": "^5.1.6",
     "supertest": "^6.3.3"
   },
   "jest": {

patches/strapi-plugin-populate-deep+3.0.1.patch

@@ -0,0 +1,16 @@
+diff --git a/node_modules/strapi-plugin-populate-deep/server/bootstrap.js b/node_modules/strapi-plugin-populate-deep/server/bootstrap.js
+index cb357c6..768359b 100644
+--- a/node_modules/strapi-plugin-populate-deep/server/bootstrap.js
++++ b/node_modules/strapi-plugin-populate-deep/server/bootstrap.js
+@@ -5,7 +5,10 @@ module.exports = ({ strapi }) => {
+   // Subscribe to the lifecycles that we are intrested in.
+   strapi.db.lifecycles.subscribe((event) => {
+     if (event.action === 'beforeFindMany' || event.action === 'beforeFindOne') {
+-      const populate = event.params?.populate;
++      let populate = event.params?.populate
++      if (typeof populate === 'string') {
++        populate = [populate]
++      }
+       const defaultDepth = strapi.plugin('strapi-plugin-populate-deep')?.config('defaultDepth') || 5
+
+       if (populate && populate[0] === 'deep') {