From 977a8dc7e3122f22bde04ce12ecb848bc6bd1af4 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sun, 27 Dec 2020 11:00:49 +0100
Subject: [PATCH 1/2] renovate: Remove redundant `packageRules`

These are built into renovatebot now.
---
 renovate.json | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/renovate.json b/renovate.json
index e5a358a95ce..6075f27a206 100644
--- a/renovate.json
+++ b/renovate.json
@@ -15,17 +15,6 @@
     },
     "postUpdateOptions": ["yarnDedupeHighest"],
     "packageRules": [{
-        "groupName": "embroider",
-        "packagePatterns": [
-            "^@embroider/"
-        ]
-    }, {
-        "groupName": "glimmer",
-        "packagePatterns": [
-            "@glimmer/component",
-            "@glimmer/tracking"
-        ]
-    }, {
         "packageNames": ["ember-cli", "ember-data", "ember-source"],
         "separateMinorPatch": true
     }]

From 300ceb35e53e379d8c31c47687867866c6883f64 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sun, 27 Dec 2020 11:02:03 +0100
Subject: [PATCH 2/2] renovate: Change `yarn-deduplicate` strategy to `fewer`

This strategy is better at avoiding dependency version conflicts
---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index 6075f27a206..574c3ad3ecc 100644
--- a/renovate.json
+++ b/renovate.json
@@ -13,7 +13,7 @@
     "rust": {
         "enabled": false
     },
-    "postUpdateOptions": ["yarnDedupeHighest"],
+    "postUpdateOptions": ["yarnDedupeFewer"],
     "packageRules": [{
         "packageNames": ["ember-cli", "ember-data", "ember-source"],
         "separateMinorPatch": true