Merge pull request #949 from SAP/combined-prs-branch

Combined PRs
SAP · Jan 19, 2024 · 53c5f5c · 53c5f5c
2 parents 3deb082 + ab06ba6
commit 53c5f5c
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 33 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,13 +35,13 @@ jobs:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
       - name: Dependency Review
         if: ${{ github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.node == '20.x' }}
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
         with:
           base-ref: ${{ github.ref_name }}
           head-ref: ${{ github.sha }}
       - name: Pull Request Dependency Review
         if: ${{ github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' && matrix.node == '20.x' }}
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
       - uses: pnpm/action-setup@v2
         with:
           version: 8
@@ -88,13 +88,13 @@ jobs:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
       - name: Dependency Review
         if: ${{ github.event_name == 'push' && matrix.os == 'ubuntu-latest' && matrix.node == '20.x' }}
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
         with:
           base-ref: ${{ github.ref_name }}
           head-ref: ${{ github.sha }}
       - name: Pull Request Dependency Review
         if: ${{ github.event_name == 'pull_request' && matrix.os == 'ubuntu-latest' && matrix.node == '20.x' }}
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
       - uses: pnpm/action-setup@v2
         with:
           version: 8

diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     }
   },
   "dependencies": {
-    "@mikro-orm/core": "^6.0.4",
+    "@mikro-orm/core": "^6.0.5",
     "@mikro-orm/mariadb": "^6.0.4",
     "@mikro-orm/reflection": "^6.0.4",
     "@mikro-orm/sqlite": "^6.0.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/ui/web/package.json b/ui/web/package.json
@@ -61,7 +61,7 @@
     "prettier": "^3.2.4",
     "rimraf": "^5.0.5",
     "typescript": "~5.3.3",
-    "vite": "^5.0.11",
+    "vite": "^5.0.12",
     "vitest": "^1.2.1"
   },
   "_id": "[email protected]"

diff --git a/ui/web/pnpm-lock.yaml b/ui/web/pnpm-lock.yaml