From 6b4a9e4ade68e292ad53ce15025c692dd5bea88c Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 23 Aug 2022 14:20:15 +0200
Subject: [PATCH] cli: make react router deps migration migrate devDeps as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fredrik Adelöw <freben@gmail.com>
Co-authored-by: blam <ben@blam.sh>
Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/commands/migrate/reactRouterDeps.ts   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/commands/migrate/reactRouterDeps.ts b/packages/cli/src/commands/migrate/reactRouterDeps.ts
index d8fa100c50..3c1ddd293d 100644
--- a/packages/cli/src/commands/migrate/reactRouterDeps.ts
+++ b/packages/cli/src/commands/migrate/reactRouterDeps.ts
@@ -34,14 +34,17 @@ export async function command() {
       }
 
       let changed = false;
-      if (packageJson.dependencies) {
-        for (const key of Object.keys(packageJson.dependencies)) {
-          if (REACT_ROUTER_DEPS.includes(key)) {
-            delete packageJson.dependencies[key];
-            const peerDeps = (packageJson.peerDependencies =
-              packageJson.peerDependencies ?? {});
-            peerDeps[key] = REACT_ROUTER_RANGE;
-            changed = true;
+      for (const depName of ['dependencies', 'devDependencies'] as const) {
+        const depsCollection = packageJson[depName];
+        if (depsCollection) {
+          for (const key of Object.keys(depsCollection)) {
+            if (REACT_ROUTER_DEPS.includes(key)) {
+              delete depsCollection[key];
+              const peerDeps = (packageJson.peerDependencies =
+                packageJson.peerDependencies ?? {});
+              peerDeps[key] = REACT_ROUTER_RANGE;
+              changed = true;
+            }
           }
         }
       }