Merge branch 'dev' into 6994-vnLog_descriptors

2025-03-14 08:18:06 +00:00 · 2025-03-14 08:18:06 +00:00 · da9d96277a
parent a5429799ec a83fecc706
commit da9d96277a
2 changed files with 8856 additions and 12318 deletions
--- a/package.json
+++ b/package.json
@ -56,6 +56,7 @@
        "eslint-plugin-cypress": "^4.1.0",
        "eslint-plugin-vue": "^9.32.0",
        "husky": "^8.0.0",
+        "junit-merge": "^2.0.0",
        "mocha": "^11.1.0",
        "postcss": "^8.4.23",
        "prettier": "^3.4.2",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml