From d9b3753f877b5dfb15f8533224dacbbbaa96b545 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 7 Dec 2022 22:56:07 +0100
Subject: [PATCH] app,create-app: update to use AppRouter

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/shy-birds-hammer.md                  | 17 +++++++++++++++++
 packages/app/src/App.tsx                        |  3 +--
 .../default-app/packages/app/src/App.tsx        |  3 +--
 3 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/shy-birds-hammer.md

diff --git a/.changeset/shy-birds-hammer.md b/.changeset/shy-birds-hammer.md
new file mode 100644
index 0000000000..132b137407
--- /dev/null
+++ b/.changeset/shy-birds-hammer.md
@@ -0,0 +1,17 @@
+---
+'@backstage/create-app': patch
+---
+
+Updated the app template to use the new `AppRouter` component instead of `app.getRouter()`.
+
+To apply this change to an existing app, make the following change to `packages/app/src/App.tsx`:
+
+```diff
+-import { FlatRoutes } from '@backstage/core-app-api';
++import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
+
+ ...
+
+ const AppProvider = app.getProvider();
+-const AppRouter = app.getRouter();
+```
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 05ef61c11a..f21872a742 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -27,7 +27,7 @@ import {
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
 import { createApp } from '@backstage/app-defaults';
-import { FlatRoutes } from '@backstage/core-app-api';
+import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import {
   AlertDisplay,
   OAuthRequestDialog,
@@ -146,7 +146,6 @@ const app = createApp({
 });
 
 const AppProvider = app.getProvider();
-const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>
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 46cb786399..368ed4d679 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
@@ -29,7 +29,7 @@ import { Root } from './components/Root';
 
 import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
 import { createApp } from '@backstage/app-defaults';
-import { FlatRoutes } from '@backstage/core-app-api';
+import { AppRouter, FlatRoutes } from '@backstage/core-app-api';
 import { CatalogGraphPage } from '@backstage/plugin-catalog-graph';
 import { RequirePermission } from '@backstage/plugin-permission-react';
 import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common/alpha';
@@ -54,7 +54,6 @@ const app = createApp({
 });
 
 const AppProvider = app.getProvider();
-const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>