fix(internal): point to external presets to DRY; update groups

bfra-me · Nov 29, 2024 · c911f77 · c911f77
1 parent 843943a
commit c911f77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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',