From d5762a332c1cbf6442f11820c1e19a59c6568fac Mon Sep 17 00:00:00 2001
From: Alex Luckett <alexgluckett@gmail.com>
Date: Thu, 5 Mar 2026 12:12:19 +0000
Subject: [PATCH 1/3] chore: improve dependabot grouping and consistency

---
 .github/dependabot.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 875fcf0b..8e789ead 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -34,6 +34,7 @@ updates:
       tools:
         patterns:
           - 'jest'
+          - 'nock'
           - 'tsx'
 
       types:
@@ -41,6 +42,36 @@ updates:
           - '@types/*'
           - 'oidc-client-ts'
 
+      forms:
+        patterns:
+          - '@defra/forms-model'
+          - '@defra/forms-engine-plugin'
+
+      aws:
+        patterns:
+          - '@aws-sdk/*'
+          - 'aws-embedded-metrics'
+
+      hapi:
+        patterns:
+          - '@hapi/*'
+          - 'blankie'
+          - 'blipp'
+          - 'hapi-*'
+          - '*-hapi'
+          - 'joi'
+
+      runtime:
+        patterns:
+          - '@defra/hapi-tracing'
+          - 'dotenv'
+          - 'ioredis'
+          - 'js-yaml'
+          - 'marked'
+          - 'minimatch'
+          - 'mongodb'
+          - 'yaml'
+
     # Schedule run every Monday, local time
     schedule:
       interval: weekly
@@ -57,6 +88,11 @@ updates:
   - package-ecosystem: github-actions
     directory: /
 
+    groups:
+      actions:
+        patterns:
+          - '*'
+
     # Schedule run every Monday, local time
     schedule:
       interval: weekly

From 78a2a3bf49cacfb062cbb08312700c4bbf8748e3 Mon Sep 17 00:00:00 2001
From: Alex Luckett <alexgluckett@gmail.com>
Date: Thu, 5 Mar 2026 12:23:19 +0000
Subject: [PATCH 2/3] chore: tailor dependabot groups to packages used in this
 repo

---
 .github/dependabot.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8e789ead..42fdf031 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -16,7 +16,6 @@ updates:
 
       lint:
         patterns:
-          - '@typescript-eslint/*'
           - 'editorconfig-checker'
           - 'eslint'
           - 'eslint-*'
@@ -34,7 +33,6 @@ updates:
       tools:
         patterns:
           - 'jest'
-          - 'nock'
           - 'tsx'
 
       types:
@@ -45,32 +43,22 @@ updates:
       forms:
         patterns:
           - '@defra/forms-model'
-          - '@defra/forms-engine-plugin'
 
       aws:
         patterns:
           - '@aws-sdk/*'
-          - 'aws-embedded-metrics'
 
       hapi:
         patterns:
           - '@hapi/*'
-          - 'blankie'
-          - 'blipp'
           - 'hapi-*'
-          - '*-hapi'
           - 'joi'
 
       runtime:
         patterns:
           - '@defra/hapi-tracing'
           - 'dotenv'
-          - 'ioredis'
-          - 'js-yaml'
-          - 'marked'
-          - 'minimatch'
           - 'mongodb'
-          - 'yaml'
 
     # Schedule run every Monday, local time
     schedule:

From 7b2e7919cc48613e5d6164ac92adf379366ccc72 Mon Sep 17 00:00:00 2001
From: Alex Luckett <alexgluckett@gmail.com>
Date: Thu, 5 Mar 2026 12:36:39 +0000
Subject: [PATCH 3/3] chore: add patch-only catch-all dependabot group

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 42fdf031..3210d890 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -60,6 +60,12 @@ updates:
           - 'dotenv'
           - 'mongodb'
 
+      dependencies:
+        patterns:
+          - '*'
+        update-types:
+          - patch
+
     # Schedule run every Monday, local time
     schedule:
       interval: weekly