Merge branch 'main' into combined-prs-branch

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 87818ade76840a72062c004ddcd1877058a98604..869d5b69b6150fb98e28e8d3a95f688749f78420 100644 (file)
--- 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
index ea2776440e1138da86c8ff8cbdaa41b8c2c2ee2a..462830f0e96e7c07fbdcbbc1742e2117e2bd7f72 100644 (file)
--- 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
index 2bc7c1d1970e29b96651840aa9a3f7d2733705ba..a471caf92d21206ba07a5d663b5b61c34c98e08d 100644 (file)
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,17 +15,17 @@ overrides:
 
 dependencies:
   '@mikro-orm/core':
-    specifier: ^6.0.4
-    version: 6.0.4
+    specifier: ^6.0.5
+    version: 6.0.5
   '@mikro-orm/mariadb':
     specifier: ^6.0.4
-    version: 6.0.4(@mikro-orm/core@6.0.4)
+    version: 6.0.4(@mikro-orm/core@6.0.5)
   '@mikro-orm/reflection':
     specifier: ^6.0.4
-    version: 6.0.4(@mikro-orm/core@6.0.4)
+    version: 6.0.4(@mikro-orm/core@6.0.5)
   '@mikro-orm/sqlite':
     specifier: ^6.0.4
-    version: 6.0.4(@mikro-orm/core@6.0.4)
+    version: 6.0.4(@mikro-orm/core@6.0.5)
   ajv:
     specifier: ^8.12.0
     version: 8.12.0
@@ -974,7 +974,7 @@ packages:
     dependencies:
       '@jercle/yargonaut': 1.1.5
       '@mikro-orm/core': 6.0.4
-      '@mikro-orm/knex': 6.0.4(@mikro-orm/core@6.0.4)(sqlite3@5.1.7)
+      '@mikro-orm/knex': 6.0.4(@mikro-orm/core@6.0.4)
       fs-extra: 11.2.0
       tsconfig-paths: 4.2.0
       yargs: 17.7.2
@@ -1000,8 +1000,22 @@ packages:
       globby: 11.1.0
       mikro-orm: 6.0.4
       reflect-metadata: 0.2.1
+    dev: true
 
-  /@mikro-orm/knex@6.0.4(@mikro-orm/core@6.0.4)(sqlite3@5.1.7):
+  /@mikro-orm/core@6.0.5:
+    resolution: {integrity: sha512-EWIrMPj0L4/TMV1Yg1RgDaFb4Ri1N70HpqwfAnulqETfEl3Z8jKH7uBh71nwwKfENle92l1jgQE52WGSRIqYOQ==}
+    engines: {node: '>= 18.12.0'}
+    dependencies:
+      dataloader: 2.2.2
+      dotenv: 16.3.1
+      esprima: 4.0.1
+      fs-extra: 11.2.0
+      globby: 11.1.0
+      mikro-orm: 6.0.5
+      reflect-metadata: 0.2.1
+    dev: false
+
+  /@mikro-orm/knex@6.0.4(@mikro-orm/core@6.0.4):
     resolution: {integrity: sha512-OoNk6M4S7ZK+h1uOe6dk6dbdCxxOXnVcwRr9a+zspn/yz/zOxt3dqQlburEXevhbNDl4U/h99BWYQ9Jw1zPrjQ==}
     engines: {node: '>= 18.12.0'}
     peerDependencies:
@@ -1020,15 +1034,58 @@ packages:
       - sqlite3
       - supports-color
       - tedious
+    dev: true
 
-  /@mikro-orm/mariadb@6.0.4(@mikro-orm/core@6.0.4):
+  /@mikro-orm/knex@6.0.4(@mikro-orm/core@6.0.5):
+    resolution: {integrity: sha512-OoNk6M4S7ZK+h1uOe6dk6dbdCxxOXnVcwRr9a+zspn/yz/zOxt3dqQlburEXevhbNDl4U/h99BWYQ9Jw1zPrjQ==}
+    engines: {node: '>= 18.12.0'}
+    peerDependencies:
+      '@mikro-orm/core': ^6.0.0
+    dependencies:
+      '@mikro-orm/core': 6.0.5
+      fs-extra: 11.2.0
+      knex: 3.1.0(sqlite3@5.1.7)
+      sqlstring: 2.3.3
+    transitivePeerDependencies:
+      - better-sqlite3
+      - mysql
+      - mysql2
+      - pg
+      - pg-native
+      - sqlite3
+      - supports-color
+      - tedious
+    dev: false
+
+  /@mikro-orm/knex@6.0.4(@mikro-orm/core@6.0.5)(sqlite3@5.1.7):
+    resolution: {integrity: sha512-OoNk6M4S7ZK+h1uOe6dk6dbdCxxOXnVcwRr9a+zspn/yz/zOxt3dqQlburEXevhbNDl4U/h99BWYQ9Jw1zPrjQ==}
+    engines: {node: '>= 18.12.0'}
+    peerDependencies:
+      '@mikro-orm/core': ^6.0.0
+    dependencies:
+      '@mikro-orm/core': 6.0.5
+      fs-extra: 11.2.0
+      knex: 3.1.0(sqlite3@5.1.7)
+      sqlstring: 2.3.3
+    transitivePeerDependencies:
+      - better-sqlite3
+      - mysql
+      - mysql2
+      - pg
+      - pg-native
+      - sqlite3
+      - supports-color
+      - tedious
+    dev: false
+
+  /@mikro-orm/mariadb@6.0.4(@mikro-orm/core@6.0.5):
     resolution: {integrity: sha512-SFa1xg2shfmiLxLkCBtFsQaqdjtkIoWEryFSLusEAM7CPtIO3IgRDYQZBBjWVgTsuZ1DKkArA60nVXVwzB3fcw==}
     engines: {node: '>= 18.12.0'}
     peerDependencies:
       '@mikro-orm/core': ^6.0.0
     dependencies:
-      '@mikro-orm/core': 6.0.4
-      '@mikro-orm/knex': 6.0.4(@mikro-orm/core@6.0.4)(sqlite3@5.1.7)
+      '@mikro-orm/core': 6.0.5
+      '@mikro-orm/knex': 6.0.4(@mikro-orm/core@6.0.5)
       mariadb: 2.5.6
     transitivePeerDependencies:
       - better-sqlite3
@@ -1041,25 +1098,25 @@ packages:
       - tedious
     dev: false
 
-  /@mikro-orm/reflection@6.0.4(@mikro-orm/core@6.0.4):
+  /@mikro-orm/reflection@6.0.4(@mikro-orm/core@6.0.5):
     resolution: {integrity: sha512-eDAVoSUrAQVsTVGB7IUmD3fHZrsk3fJbdk/9mAvCDCJrzG+G/Ng9TfHOdUCgH35Wzj1u6zxuftmYV7dnogKvaA==}
     engines: {node: '>= 18.12.0'}
     peerDependencies:
       '@mikro-orm/core': ^6.0.0
     dependencies:
-      '@mikro-orm/core': 6.0.4
+      '@mikro-orm/core': 6.0.5
       globby: 11.1.0
       ts-morph: 21.0.1
     dev: false
 
-  /@mikro-orm/sqlite@6.0.4(@mikro-orm/core@6.0.4):
+  /@mikro-orm/sqlite@6.0.4(@mikro-orm/core@6.0.5):
     resolution: {integrity: sha512-gG+OWKY1rI/YTeAn5JGZlhA9PQ3NsAsp+zOLFOedvmNF8dK3cBZJV3TqCzKPYi/plVQH+dwxo1T4ZDORpt+3sg==}
     engines: {node: '>= 18.12.0'}
     peerDependencies:
       '@mikro-orm/core': ^6.0.0
     dependencies:
-      '@mikro-orm/core': 6.0.4
-      '@mikro-orm/knex': 6.0.4(@mikro-orm/core@6.0.4)(sqlite3@5.1.7)
+      '@mikro-orm/core': 6.0.5
+      '@mikro-orm/knex': 6.0.4(@mikro-orm/core@6.0.5)(sqlite3@5.1.7)
       fs-extra: 11.2.0
       sqlite3: 5.1.7
       sqlstring-sqlite: 0.1.1
@@ -6416,6 +6473,12 @@ packages:
   /mikro-orm@6.0.4:
     resolution: {integrity: sha512-rhC9PJ6rhfOoBQgnVpC+3GeeILQf0cfU1mSZHA+74FjpurfrznS5AZmuTxSKBnfjpMzrPoTOOwMwQC6DE7aVaQ==}
     engines: {node: '>= 18.12.0'}
+    dev: true
+
+  /mikro-orm@6.0.5:
+    resolution: {integrity: sha512-4EwyJ85j7bawmuxiKLQVVoX3C305k+M7rcOswHt0sZmnOHo8K85lwUOCjh6dEQY+slfULbvnT8+kspPgPmk+Ww==}
+    engines: {node: '>= 18.12.0'}
+    dev: false
 
   /miller-rabin@4.0.1:
     resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==}

diff --git a/ui/web/package.json b/ui/web/package.json
index c8eb183b008b57b1fe54d6c40809d8f998146535..c757c1fde576937c86b0c1271b33aa8717e29d15 100644 (file)
--- 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": "webui@0.1.1"

diff --git a/ui/web/pnpm-lock.yaml b/ui/web/pnpm-lock.yaml
index 358aa3b945ff98e01f38fad5e4c23f7b1502e9af..ad4917ae6a21bad1a65487566b4f27057e664f70 100644 (file)
--- a/ui/web/pnpm-lock.yaml
+++ b/ui/web/pnpm-lock.yaml
@@ -42,10 +42,10 @@ devDependencies:
     version: 6.19.0(eslint@8.56.0)(typescript@5.3.3)
   '@vitejs/plugin-vue':
     specifier: ^5.0.3
-    version: 5.0.3(vite@5.0.11)(vue@3.4.15)
+    version: 5.0.3(vite@5.0.12)(vue@3.4.15)
   '@vitejs/plugin-vue-jsx':
     specifier: ^3.1.0
-    version: 3.1.0(vite@5.0.11)(vue@3.4.15)
+    version: 3.1.0(vite@5.0.12)(vue@3.4.15)
   '@vitest/coverage-v8':
     specifier: ^1.2.1
     version: 1.2.1(vitest@1.2.1)
@@ -92,8 +92,8 @@ devDependencies:
     specifier: ~5.3.3
     version: 5.3.3
   vite:
-    specifier: ^5.0.11
-    version: 5.0.11(@types/node@20.11.5)
+    specifier: ^5.0.12
+    version: 5.0.12(@types/node@20.11.5)
   vitest:
     specifier: ^1.2.1
     version: 1.2.1(@types/node@20.11.5)(jsdom@23.2.0)
@@ -1052,7 +1052,7 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: true
 
-  /@vitejs/plugin-vue-jsx@3.1.0(vite@5.0.11)(vue@3.4.15):
+  /@vitejs/plugin-vue-jsx@3.1.0(vite@5.0.12)(vue@3.4.15):
     resolution: {integrity: sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -1062,20 +1062,20 @@ packages:
       '@babel/core': 7.23.7
       '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.7)
       '@vue/babel-plugin-jsx': 1.1.6(@babel/core@7.23.7)
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
       vue: 3.4.15(typescript@5.3.3)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@vitejs/plugin-vue@5.0.3(vite@5.0.11)(vue@3.4.15):
+  /@vitejs/plugin-vue@5.0.3(vite@5.0.12)(vue@3.4.15):
     resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       vite: ^5.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
       vue: 3.4.15(typescript@5.3.3)
     dev: true
 
@@ -3910,7 +3910,7 @@ packages:
       debug: 4.3.4
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -3922,8 +3922,8 @@ packages:
       - terser
     dev: true
 
-  /vite@5.0.11(@types/node@20.11.5):
-    resolution: {integrity: sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==}
+  /vite@5.0.12(@types/node@20.11.5):
+    resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -4003,7 +4003,7 @@ packages:
       strip-literal: 1.3.0
       tinybench: 2.6.0
       tinypool: 0.8.2
-      vite: 5.0.11(@types/node@20.11.5)
+      vite: 5.0.12(@types/node@20.11.5)
       vite-node: 1.2.1(@types/node@20.11.5)
       why-is-node-running: 2.2.2
     transitivePeerDependencies: