From a22eecd7714b665af046a9bdcd6669e5c81be75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= <ferferga@hotmail.com>
Date: Thu, 1 Jun 2023 12:14:16 +0000
Subject: [PATCH] chore: fix renovate config

* Cargo dependency updates were merged with the lockfile ones, as showcased in https://github.com/renovatebot/renovate/discussions/22524#discussioncomment-6059181
* Vulnerability dependencies were not working because of incorrect group configuration
* Merge all lockfile maintenance updates in a sigle PR
* Don't distinguish between major and minor versions in CI dependency
updates. They're now in a single PR.
---
 .github/renovate.json | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index f0d121cbf1d..60d4382eb06 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,4 +1,5 @@
 {
+  "timezone": "Europe/Madrid",
   "packageRules": [
     {
       "matchManagers": [
@@ -7,8 +8,8 @@
       "matchDepTypes": [
         "devDependencies"
       ],
-      "groupName": "development dependencies",
-      "groupSlug": "dev-deps"
+      "groupName": "npm development dependencies",
+      "groupSlug": "npm-dev"
     },
     {
       "matchManagers": [
@@ -17,24 +18,38 @@
       "matchDepTypes": [
         "dependencies"
       ],
-      "groupName": "dependencies",
-      "groupSlug": "deps"
+      "groupName": "npm dependencies",
+      "groupSlug": "npm"
     },
     {
       "matchManagers": [
         "github-actions"
       ],
+      "matchUpdateTypes": [
+        "patch",
+        "minor",
+        "major"
+      ],
       "groupName": "CI dependencies",
-      "groupSlug": "ci-deps",
-      "separateMajorMinor": false
+      "groupSlug": "ci-deps"
     },
     {
       "matchManagers": [
         "cargo"
       ],
-      "groupName": "Tauri dependencies",
-      "groupSlug": "tauri-deps",
-      "separateMajorMinor": false
+      "matchUpdateTypes": [
+        "patch",
+        "minor",
+        "major"
+      ],
+      "groupName": "cargo dependencies",
+      "groupSlug": "cargo"
+    },
+    {
+      "matchUpdateTypes": [
+        "lockFileMaintenance"
+      ],
+      "groupSlug": "lockfiles"
     }
   ],
   "dependencyDashboard": false,
@@ -42,7 +57,9 @@
   "prHourlyLimit": 0,
   "transitiveRemediation": true,
   "vulnerabilityAlerts": {
-    "groupName": "vuln-alerts",
+    "enabled": true,
+    "groupName": "vulnerable dependencies",
+    "groupSlug": "vulnerabilities",
     "labels": [
       "security",
       "dependencies"