From 4c1f50cbd2062ff7516887a6ab1d772d17728a14 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sun, 7 Jan 2024 14:37:56 +0100
Subject: [PATCH] core-compat-api: wrap discovered elements with compatWrapper

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/brave-queens-crash.md              |  5 +++++
 .../src/collectLegacyRoutes.tsx               | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 .changeset/brave-queens-crash.md

diff --git a/.changeset/brave-queens-crash.md b/.changeset/brave-queens-crash.md
new file mode 100644
index 0000000000..c28e5975f3
--- /dev/null
+++ b/.changeset/brave-queens-crash.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-compat-api': patch
+---
+
+Make `convertLegacyApp` wrap discovered routes with `compatWrapper`.
diff --git a/packages/core-compat-api/src/collectLegacyRoutes.tsx b/packages/core-compat-api/src/collectLegacyRoutes.tsx
index b4af6ac01a..4d560b81d5 100644
--- a/packages/core-compat-api/src/collectLegacyRoutes.tsx
+++ b/packages/core-compat-api/src/collectLegacyRoutes.tsx
@@ -33,6 +33,7 @@ import {
 import React, { Children, ReactNode, isValidElement } from 'react';
 import { Route, Routes } from 'react-router-dom';
 import { convertLegacyRouteRef } from './convertLegacyRouteRef';
+import { compatWrapper } from './compatWrapper';
 
 /*
 
@@ -207,14 +208,16 @@ export function collectLegacyRoutes(
             }),
           },
           loader: async () =>
-            route.props.children ? (
-              <Routes>
-                <Route path="*" element={routeElement}>
-                  <Route path="*" element={route.props.children} />
-                </Route>
-              </Routes>
-            ) : (
-              routeElement
+            compatWrapper(
+              route.props.children ? (
+                <Routes>
+                  <Route path="*" element={routeElement}>
+                    <Route path="*" element={route.props.children} />
+                  </Route>
+                </Routes>
+              ) : (
+                routeElement
+              ),
             ),
         }),
       );