From 629ad53348cebb5411696dc869645084df1f4860 Mon Sep 17 00:00:00 2001
From: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
Date: Mon, 23 Aug 2021 13:38:47 -0700
Subject: [PATCH] Fixes for create-app template from 0.3.30, 0.3.25

Signed-off-by: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
---
 .../templates/default-app/packages/app/src/App.tsx        | 6 +++++-
 .../packages/backend/src/plugins/scaffolder.ts            | 8 ++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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 57491c9222..bcb5992d18 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
@@ -21,6 +21,7 @@ import {
 import { UserSettingsPage } from '@backstage/plugin-user-settings';
 import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
+import { searchPage } from './components/search/SearchPage';
 import { Root } from './components/Root';
 
 import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
@@ -68,7 +69,10 @@ const routes = (
       element={<TechRadarPage width={1500} height={800} />}
     />
     <Route path="/catalog-import" element={<CatalogImportPage />} />
-    <Route path="/search" element={<SearchPage />} />
+      <Route path="/search" element={<SearchPage />}>
+      {searchPage}
+    </Route>
+    ;
     <Route path="/settings" element={<UserSettingsPage />} />
   </FlatRoutes>
 );
diff --git a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
index 2ce640c124..6be2e9712d 100644
--- a/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
+++ b/packages/create-app/templates/default-app/packages/backend/src/plugins/scaffolder.ts
@@ -1,7 +1,4 @@
-import {
-  DockerContainerRunner,
-  SingleHostDiscovery,
-} from '@backstage/backend-common';
+import { DockerContainerRunner } from '@backstage/backend-common';
 import { CatalogClient } from '@backstage/catalog-client';
 import { createRouter } from '@backstage/plugin-scaffolder-backend';
 import Docker from 'dockerode';
@@ -13,11 +10,10 @@ export default async function createPlugin({
   config,
   database,
   reader,
+  discovery,
 }: PluginEnvironment): Promise<Router> {
   const dockerClient = new Docker();
   const containerRunner = new DockerContainerRunner({ dockerClient });
-
-  const discovery = SingleHostDiscovery.fromConfig(config);
   const catalogClient = new CatalogClient({ discoveryApi: discovery });
 
   return await createRouter({