Merge branch 'master' into eide/lighthouse-new-routing-api

packages/app/package.json

@@ -27,7 +27,7 @@
     "@backstage/plugin-welcome": "^0.1.1-alpha.21",
     "@backstage/test-utils": "^0.1.1-alpha.21",
     "@backstage/theme": "^0.1.1-alpha.21",
-    "@material-ui/core": "^4.9.1",
+    "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@octokit/rest": "^18.0.0",
     "@roadiehq/backstage-plugin-github-pull-requests": "0.3.0",

packages/app/src/App.tsx

@@ -19,6 +19,7 @@ import {
   AlertDisplay,
   OAuthRequestDialog,
   SignInPage,
+  createRouteRef,
 } from '@backstage/core';
 import React, { FC } from 'react';
 import Root from './components/Root';
@@ -31,6 +32,7 @@ import { Router as DocsRouter } from '@backstage/plugin-techdocs';
 import { Router as GraphiQLRouter } from '@backstage/plugin-graphiql';
 import { Router as TechRadarRouter } from '@backstage/plugin-tech-radar';
 import { Router as LighthouseRouter } from '@backstage/plugin-lighthouse';
+import { Router as RegisterComponentRouter } from '@backstage/plugin-register-component';
 import { Route, Routes, Navigate } from 'react-router';
 
 import { EntityPage } from './components/catalog/EntityPage';
@@ -56,11 +58,16 @@ const AppProvider = app.getProvider();
 const AppRouter = app.getRouter();
 const deprecatedAppRoutes = app.getRoutes();
 
+const catalogRouteRef = createRouteRef({
+  path: '/catalog',
+  title: 'Service Catalog',
+});
+
 const AppRoutes = () => (
   <Routes>
     <Navigate key="/" to="/catalog" />
     <Route
-      path="/catalog/*"
+      path={`${catalogRouteRef.path}/*`}
       element={<CatalogRouter EntityPage={EntityPage} />}
     />
     <Route path="/docs/*" element={<DocsRouter />} />
@@ -70,6 +77,10 @@ const AppRoutes = () => (
     />
     <Route path="/graphiql" element={<GraphiQLRouter />} />
     <Route path="/lighthouse/*" element={<LighthouseRouter />} />
+    <Route
+      path="/register-component"
+      element={<RegisterComponentRouter catalogRouteRef={catalogRouteRef} />}
+    />
     {...deprecatedAppRoutes}
   </Routes>
 );