From 6b31645d621b303ac4e55986bb14d19e4b44c0b2 Mon Sep 17 00:00:00 2001
From: Dylan Anthony <dbanty@users.noreply.github.com>
Date: Thu, 25 May 2023 11:49:08 -0600
Subject: [PATCH 1/4] ci: Enable Renovate to auto-update Router

---
 renovate.json5 => .github/renovate.json5 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
 rename renovate.json5 => .github/renovate.json5 (79%)

diff --git a/renovate.json5 b/.github/renovate.json5
similarity index 79%
rename from renovate.json5
rename to .github/renovate.json5
index e3b46b7ee..3fb71b0c1 100644
--- a/renovate.json5
+++ b/.github/renovate.json5
@@ -1,6 +1,8 @@
 {
-  "extends": ["apollo-open-source", "github>Turbo87/renovate-config//rust/updateToolchain"],
-  "enabledManagers": ["npm", "cargo"],
+  "extends": [
+    "github>apollographql/renovate-config-apollo-open-source",
+    "github>Turbo87/renovate-config//rust/updateToolchain"
+  ],
   "packageRules": [
     // Bunch up all non-major npm dependencies into a single PR.  In the common case
     // where the upgrades apply cleanly, this causes less noise and is resolved faster
@@ -58,5 +60,17 @@
       "paths": ["docs/package.json"],
       "extends": ["apollo-docs"],
     }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "^latest_plugin_versions\\.json$"
+      ],
+      "matchStrings": [
+        "\"router\"(.|\\s)*?\"latest-1\": \"(?<currentValue>v\\d+\\.\\d+\\.\\d+)\""
+      ],
+      "depNameTemplate": "apollographql/router",
+      "datasourceTemplate": "github-releases"
+    }
   ]
 }

From af1b3a1ff5f4553f4515a32c440924eef287ec20 Mon Sep 17 00:00:00 2001
From: Dylan Anthony <dbanty@users.noreply.github.com>
Date: Thu, 25 May 2023 12:06:50 -0600
Subject: [PATCH 2/4] ci: Remove Renovate docs config, fix extends

---
 .github/renovate.json5 | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 3fb71b0c1..3ab0caba4 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -1,6 +1,6 @@
 {
   "extends": [
-    "github>apollographql/renovate-config-apollo-open-source",
+    "github>apollographql/renovate-config-apollo-open-source:default.json5",
     "github>Turbo87/renovate-config//rust/updateToolchain"
   ],
   "packageRules": [
@@ -36,29 +36,6 @@
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "groupName": "all non-major packages >= 1.0",
       "groupSlug": "all-non-major-gte-1.0"
-    },
-    // The current Apollo Gatsby theme does not support a version of Gatsby
-    // that supports React 17.
-    {
-      "matchPaths": [
-        "docs/package.json"
-      ],
-      "matchPackageNames": ["react", "react-dom"],
-      "allowedVersions": "16.x",
-    },
-    // The current Apollo Gatsby version is pinned to v3
-    {
-      "matchPaths": [
-        "docs/package.json"
-      ],
-      "matchPackageNames": ["gatsby"],
-      "allowedVersions": "3.x",
-    }
-  ],
-  "pathRules": [
-    {
-      "paths": ["docs/package.json"],
-      "extends": ["apollo-docs"],
     }
   ],
   "regexManagers": [

From 5ec380ad4408b0ebd7c76b32ee615758259c6b1e Mon Sep 17 00:00:00 2001
From: Dylan Anthony <dbanty@users.noreply.github.com>
Date: Thu, 25 May 2023 12:37:53 -0600
Subject: [PATCH 3/4] ci: Auto-bump federation plugin

---
 .github/renovate.json5 | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 3ab0caba4..bba23efd5 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -36,6 +36,10 @@
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "groupName": "all non-major packages >= 1.0",
       "groupSlug": "all-non-major-gte-1.0"
+    },
+    {
+      "matchPackageNames": ["apollographql/federation-rs"],
+      "extractVersion": "supergraph@(?<currentValue>v\\d+\\.\\d+\\.\\d+)",
     }
   ],
   "regexManagers": [
@@ -48,6 +52,14 @@
       ],
       "depNameTemplate": "apollographql/router",
       "datasourceTemplate": "github-releases"
+    },
+    {
+      "fileMatch": ["^latest_plugin_versions\\.json$"],
+      "matchStrings": [
+        "\"supergraph\"(.|\\s)*?\"latest-2\": \"(?<currentValue>v\\d+\\.\\d+\\.\\d+)\""
+      ],
+      "depNameTemplate": "apollographql/federation-rs",
+      "datasourceTemplate": "github-releases"
     }
   ]
 }

From d55b784d5e6e7169201088d9a874cf884d015ad6 Mon Sep 17 00:00:00 2001
From: Dylan Anthony <dbanty@users.noreply.github.com>
Date: Thu, 25 May 2023 12:50:37 -0600
Subject: [PATCH 4/4] ci: Fix federation plugin version extractor

---
 .github/renovate.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index bba23efd5..11b89d5f8 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -39,7 +39,7 @@
     },
     {
       "matchPackageNames": ["apollographql/federation-rs"],
-      "extractVersion": "supergraph@(?<currentValue>v\\d+\\.\\d+\\.\\d+)",
+      "extractVersion": "^supergraph@(?<version>v\\d+\\.\\d+\\.\\d+)$",
     }
   ],
   "regexManagers": [