From ccaecb6d4173784dbc98c55ef5eb16ab820bf4a3 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Thu, 4 Apr 2024 17:46:32 +0200
Subject: [PATCH 1/2] chore: Remove renovate (rip)

---
 .github/renovate.json5 | 45 ------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 .github/renovate.json5

diff --git a/.github/renovate.json5 b/.github/renovate.json5
deleted file mode 100644
index edfc86a0a171..000000000000
--- a/.github/renovate.json5
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": ["config:recommended"],
-    // un-ignoring "tests" after ":ignoreModulesAndTests" via
-    // "config:recommended" - we have utilities in there
-    "ignorePaths": [
-        "**/node_modules/**"
-    ],
-    // Package rules are matched such that later rules override earlier ones.
-    "packageRules": [
-        {
-            "matchCategories": ["rust"],
-            "groupName": "Rust dependencies",
-            "rangeStrategy": "bump",
-            "extends": ["schedule:weekly"],
-        },
-        {
-            "matchCategories": ["rust"],
-            "matchPackageNames": ["winit", "wgpu", "naga", "naga_oil", "egui-winit", "egui-wgpu", "raw-window-handle"],
-            "groupName": "Rust dependencies related to winit and wgpu",
-            "rangeStrategy": "bump",
-            "extends": ["schedule:weekly"],
-        },
-        {
-            "matchPackageNames": ["wasm-bindgen", "js-sys", "web-sys", "wasm-bindgen-futures"],
-            "groupName": "wasm-bindgen",
-        },
-        // Disable `tracing-tracy` updates (needed although it's pinned in `desktop/Cargo.toml`).
-        {
-            "matchPackageNames": ["tracing-tracy"],
-            "enabled": false,
-        },
-        {
-            "matchCategories": ["js"],
-            "groupName": "Node.js dependencies",
-            "rangeStrategy": "bump",
-            "extends": ["schedule:monthly"],
-        },
-        {
-            "matchManagers": ["github-actions"],
-            "groupName": "GitHub Actions dependencies",
-            "extends": ["schedule:monthly"],
-        },
-    ],
-}

From 613729ac817438be7fc1201b7d01cb376a82fea4 Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Thu, 4 Apr 2024 17:56:24 +0200
Subject: [PATCH 2/2] chore: Adjust dependabot groups, fixed cargo

---
 .github/dependabot.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index a347a8181680..e8f7b396f47d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,32 +1,38 @@
 version: 2
 updates:
   - package-ecosystem: "npm"
+    allow:
+      - dependency-type: "all"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      nodejs-dependencies:
+      npm-minor:
         patterns:
-        - "*"
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
 
-  - package-ecosystem: "rust"
+  - package-ecosystem: "cargo"
+    allow:
+      - dependency-type: "all"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      winit-wgpu-dependencies:
+      winit-wgpu-egui:
         patterns:
         - "winit"
         - "wgpu"
         - "naga"
         - "naga_oil"
-        - "egui-winit"
-        - "egui-wgpu"
+        - "egui*"
         - "raw-window-handle"
       wasm-bindgen-dependencies:
         patterns:
@@ -34,5 +40,12 @@ updates:
         - "js-sys"
         - "web-sys"
         - "wasm-bindgen-futures"
+      gradle-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
     ignore:
-      - dependency-name: "tracing-tracy"
\ No newline at end of file
+      - dependency-name: "tracing-tracy"
+      - dependency-name: "tracy-client"
\ No newline at end of file