Merge remote-tracking branch 'origin/dev' into dev

renovate.json

@@ -1,70 +1,50 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["config:recommended"],
+  "extends": ["config:recommended", "schedule:weekly"],
   "dependencyDashboard": true,
   "configMigration": true,
   "timezone": "America/New_York",
   "assignees": ["pbennett"],
   "baseBranches": ["dev"],
   "separateMultipleMajor": true,
-  "separateMajorMinor": true,
-  "separateMinorPatch": false,
+  "minimumReleaseAge": "3 days",
   "ignorePaths": ["ui/.copier-answers.yml"],
+  "lockFileMaintenance": {
+    "enabled": true,
+    "schedule": "before 4am on Tuesday"
+  },
   "packageRules": [
+    {
+      "groupName": "non-major dependencies",
+      "matchDepTypes": ["dependencies", "devDependencies"],
+      "matchUpdateTypes": ["patch", "minor"],
+      "matchPackageNames": ["!vitest", "!@vitest/**"]
+    },
+    {
+      "groupName": "Node Manager",
+      "matchFileNames": ["nodemgr/go.mod", "Dockerfile-nodemgr"],
+      "semanticCommitScope": "nodemgr"
+    },
+    {
+      "groupName": "UI",
+      "matchFileNames": ["ui/package.json"],
+      "matchDepTypes": ["dependencies", "devDependencies"],
+      "matchPackageNames": ["!vitest", "!@vitest/**"],
+      "assignees": ["drichar"],
+      "semanticCommitScope": "ui",
+      "rangeStrategy": "pin"
+    },
+    {
+      "groupName": "Vitest",
+      "matchPackageNames": ["vitest", "@vitest/**"]
+    },
     {
       "matchCategories": ["node"],
       "enabled": false
     },
     {
-      "matchFileNames": ["nodemgr/go.mod", "Dockerfile-nodemgr"],
-      "groupName": "Node Manager",
-      "semanticCommitScope": "nodemgr",
-      "schedule": "before 4am on Monday"
+      "matchDepTypes": ["optionalDependencies", "peerDependencies", "engines"],
+      "enabled": false
     }
-  ],
-  "npm": {
-    "additionalBranchPrefix": "{{{parentDir}}}-",
-    "minimumReleaseAge": "3 days",
-    "lockFileMaintenance": {
-      "enabled": true,
-      "schedule": "on the 1st day of the month",
-      "semanticCommitScope": "deps",
-      "additionalBranchPrefix": ""
-    },
-    "packageRules": [
-      {
-        "matchDepTypes": ["dependencies", "devDependencies"],
-        "matchUpdateTypes": ["patch", "minor"],
-        "groupName": "non-major dependencies"
-      },
-      {
-        "matchDepTypes": ["devDependencies"],
-        "groupName": "ESLint/Prettier",
-        "matchPackageNames": ["/lint/", "/prettier/"]
-      },
-      {
-        "matchFileNames": ["contracts/bootstrap/package.json"],
-        "semanticCommitScope": "bootstrap"
-      },
-      {
-        "matchFileNames": ["ui/package.json"],
-        "assignees": ["drichar"],
-        "schedule": "on the 1st day of the month",
-        "semanticCommitScope": "ui",
-        "rangeStrategy": "pin"
-      },
-      {
-        "matchPackageNames": ["vitest", "@vitest/**"],
-        "groupName": "Vitest"
-      },
-      {
-        "matchDepTypes": [
-          "optionalDependencies",
-          "peerDependencies",
-          "engines"
-        ],
-        "enabled": false
-      }
-    ]
-  }
+  ]
 }

ui/vite.config.mjs

@@ -11,15 +11,19 @@ import { version } from './package.json'
  * This plugin replaces the `__APP_VERSION__` placeholder in the `public/version.json` file
  */
 const replaceVersionPlugin = () => {
+  let outDir
   return {
     name: 'replace-version-in-json',
     apply: 'build',
     enforce: 'pre',
+    configResolved(config) {
+      outDir = config.build.outDir
+    },
     generateBundle() {
       const filePath = path.resolve(__dirname, 'public/version.json')
       const content = fs.readFileSync(filePath, 'utf-8')
       const updatedContent = content.replace('__APP_VERSION__', version)
-      const newFilePath = path.resolve(__dirname, 'dist/version.json')
+      const newFilePath = path.resolve(outDir, 'version.json')
       fs.writeFileSync(newFilePath, updatedContent, 'utf-8')
     },
   }