From c911f77f57e4161f0cf4bcef3826b65aa96cf4e9 Mon Sep 17 00:00:00 2001
From: "Marcus R. Brown" <git@mrbro.dev>
Date: Fri, 29 Nov 2024 02:51:31 -0700
Subject: [PATCH] fix(internal): point to external presets to DRY; update
 groups

---
 group.json     | 7 +++----
 internal.json5 | 5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/group.json b/group.json
index 0d7e2ec..db1c899 100644
--- a/group.json
+++ b/group.json
@@ -108,7 +108,7 @@
     "packageRules": [
       {
         "groupName": "Octokit packages",
-        "matchSourceUrlPrefixes": ["https://github.com/octokit/"]
+        "matchSourceUrls": ["https://github.com/octokit/*"]
       }
     ]
   },
@@ -118,8 +118,7 @@
     "packageRules": [
       {
         "groupName": "Prettier packages",
-        "matchPackageNames": ["prettier"],
-        "matchPackagePatterns": ["^@prettier\\/", "^prettier-plugin-"]
+        "matchPackageNames": ["prettier", "@prettier/*", "prettier-plugin-*"]
       }
     ]
   },
@@ -191,7 +190,7 @@
         "description": "All Vite related packages",
         "groupName": "Vite packages",
         "matchDatasources": ["npm"],
-        "matchPackagePatterns": ["^vite$", "vite-plugin", "@vitejs"]
+        "matchPackageNames": ["vite", "vite-plugin*", "@vitejs/*"]
       }
     ]
   }
diff --git a/internal.json5 b/internal.json5
index 8db705c..ab3aad1 100644
--- a/internal.json5
+++ b/internal.json5
@@ -3,10 +3,11 @@
   description: 'Internal Renovate configuration for @bfra-me.',
 
   extends: [
+    'github>microsoft/m365-renovate-config:groupTypes#v2.6.1',
     'github>bfra-me/renovate-config:group/octokit',
     'github>bfra-me/renovate-config:group/prettier',
-    'github>bfra-me/renovate-config:group/react',
-    'github>bfra-me/renovate-config:group/rollup',
+    'github>microsoft/m365-renovate-config:groupReact#v2.6.1',
+    'github>microsoft/m365-renovate-config:groupRollup#v2.6.1',
     'github>bfra-me/renovate-config:group/vite',
     'github>bfra-me/renovate-config:maintenance/security',
     'github>bfra-me/renovate-config:maintenance/weeklyLockFileUpdates',