From 58c2264325243c4a1b3a3ba769713df0491c11cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Thu, 22 Sep 2022 11:32:56 +0200
Subject: [PATCH] update Navigate properly, and add a changeset noting the
 router stable update in create-app
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/clean-camels-sneeze.md                    | 12 ++++++++++++
 packages/app/src/App.tsx                             |  2 +-
 .../templates/default-app/packages/app/src/App.tsx   |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/clean-camels-sneeze.md

diff --git a/.changeset/clean-camels-sneeze.md b/.changeset/clean-camels-sneeze.md
new file mode 100644
index 0000000000..0fccb52e0b
--- /dev/null
+++ b/.changeset/clean-camels-sneeze.md
@@ -0,0 +1,12 @@
+---
+'@backstage/create-app': patch
+---
+
+Newly created Backstage repositories now use the stable version 6 of
+`react-router`, just like the main repo does. Please let us know if you find any
+issues with this.
+
+Migrating to the stable version of `react-router` is optional for the time
+being. But if you want to do the same for your existing repository, please
+follow [this
+guide](https://backstage.io/docs/tutorials/react-router-stable-migration).
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 65a43b715b..a6c613ded7 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -148,7 +148,7 @@ const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>
-    <Navigate key="/" to="catalog" />
+    <Route path="/" element={<Navigate to="/catalog" />} />
     {/* TODO(rubenl): Move this to / once its more mature and components exist */}
     <Route path="/home" element={<HomepageCompositionRoot />}>
       {homePage}
diff --git a/packages/create-app/templates/default-app/packages/app/src/App.tsx b/packages/create-app/templates/default-app/packages/app/src/App.tsx
index c5b8d39fde..4d5ace5aa4 100644
--- a/packages/create-app/templates/default-app/packages/app/src/App.tsx
+++ b/packages/create-app/templates/default-app/packages/app/src/App.tsx
@@ -58,7 +58,7 @@ const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>
-    <Navigate key="/" to="catalog" />
+    <Route path="/" element={<Navigate to="/catalog" />} />
     <Route path="/catalog" element={<CatalogIndexPage />} />
     <Route
       path="/catalog/:namespace/:kind/:name"