From fc0aa3e00ac063c72b025f6b87fdfc4f549c44ae Mon Sep 17 00:00:00 2001
From: Aramis Sennyey <sennyeya@amazon.com>
Date: Tue, 29 Nov 2022 13:06:08 -0500
Subject: [PATCH] Rebase fixes

Signed-off-by: Aramis Sennyey <sennyeya@amazon.com>
---
 .changeset/spotty-numbers-occur.md           | 7 -------
 .github/vale/Vocab/Backstage/accept.txt      | 6 ++++++
 packages/app/src/App.tsx                     | 2 +-
 packages/core-app-api/src/app/AppManager.tsx | 6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 .changeset/spotty-numbers-occur.md

diff --git a/.changeset/spotty-numbers-occur.md b/.changeset/spotty-numbers-occur.md
deleted file mode 100644
index 89c0814fd0..0000000000
--- a/.changeset/spotty-numbers-occur.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@backstage/cli': patch
----
-
-Allow relative URLs to be passed as config values for `app.baseUrl` and `backend.baseUrl`. For example, `app.baseUrl` can now be `/`.
-
-Relative URLs are only supported for frontend builds, the backend still needs the full URL defined before run time.
diff --git a/.github/vale/Vocab/Backstage/accept.txt b/.github/vale/Vocab/Backstage/accept.txt
index ca031c24ca..bba59094e3 100644
--- a/.github/vale/Vocab/Backstage/accept.txt
+++ b/.github/vale/Vocab/Backstage/accept.txt
@@ -1,5 +1,6 @@
 abc
 accessors
+ACLs
 addon
 addons
 ADRs
@@ -32,6 +33,7 @@ boolean
 Brex
 builtins
 callout
+CDNs
 Chai
 changeset
 changesets
@@ -165,6 +167,7 @@ JWTs
 Kaewkasi
 Keyv
 Knex
+KPIs
 kubectl
 kubernetes
 kubernetes
@@ -349,6 +352,7 @@ templater
 Templater
 templaters
 Templaters
+TFRecord
 theia
 thumbsup
 todo
@@ -366,6 +370,7 @@ transpiled
 transpiler
 transpilers
 truthy
+TSDoc
 typeahead
 ui
 unbreak
@@ -394,6 +399,7 @@ widget's
 winston
 www
 WWW
+XCMetrics
 XML
 xyz
 yaml
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index e766df868d..fd73e99bcb 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -150,7 +150,7 @@ const AppRouter = app.getRouter();
 
 const routes = (
   <FlatRoutes>
-    <Route path="/" element={<Navigate 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/core-app-api/src/app/AppManager.tsx b/packages/core-app-api/src/app/AppManager.tsx
index 9c3f0eab6d..fff061217c 100644
--- a/packages/core-app-api/src/app/AppManager.tsx
+++ b/packages/core-app-api/src/app/AppManager.tsx
@@ -463,7 +463,7 @@ export class AppManager implements BackstageApp {
         }
 
         return (
-          <RouterComponent>
+          <RouterComponent basename={basePath}>
             <RouteTracker routeObjects={routeObjects} />
             {children}
           </RouterComponent>
@@ -472,7 +472,7 @@ export class AppManager implements BackstageApp {
 
       if (isReactRouterBeta()) {
         return (
-          <RouterComponent basename={basePath}>
+          <RouterComponent>
             <RouteTracker routeObjects={routeObjects} />
             <SignInPageWrapper component={SignInPageComponent}>
               <Routes>
@@ -484,7 +484,7 @@ export class AppManager implements BackstageApp {
       }
 
       return (
-        <RouterComponent>
+        <RouterComponent basename={basePath}>
           <RouteTracker routeObjects={routeObjects} />
           <SignInPageWrapper component={SignInPageComponent}>
             <>{children}</>