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 1/3] 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({

From 8fbf3e74e55295bf2ba95fedfd808f0c1c92f32f Mon Sep 17 00:00:00 2001
From: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
Date: Tue, 24 Aug 2021 14:18:51 -0700
Subject: [PATCH 2/3] Fix white space at Route path search

Signed-off-by: SrikarAnanthula <783594+ananthulasrikar@users.noreply.github.com>
---
 .../create-app/templates/default-app/packages/app/src/App.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bcb5992d18..95542f2865 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
@@ -69,7 +69,7 @@ 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>
     ;

From 25924638baf8c66412293e6598c77754b0682c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 30 Aug 2021 11:17:50 +0200
Subject: [PATCH 3/3] fix review comments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/strong-beers-ring.md                              | 5 +++++
 packages/create-app/CHANGELOG.md                             | 2 +-
 .../templates/default-app/packages/app/src/App.tsx           | 1 -
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/strong-beers-ring.md

diff --git a/.changeset/strong-beers-ring.md b/.changeset/strong-beers-ring.md
new file mode 100644
index 0000000000..17a6d89fcc
--- /dev/null
+++ b/.changeset/strong-beers-ring.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Minor tweaks to the create-app template to match earlier documented changes
diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md
index 9320a73b6e..1983670e8b 100644
--- a/packages/create-app/CHANGELOG.md
+++ b/packages/create-app/CHANGELOG.md
@@ -594,7 +594,7 @@
   -<Route path="/search" element={<SearchPage />} />
   +<Route path="/search" element={<SearchPage />}>
   +  {searchPage}
-  +</Route>;
+  +</Route>
   ```
 
 - Updated dependencies [9cd3c533c]
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 95542f2865..8750b37b0c 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
@@ -72,7 +72,6 @@ const routes = (
     <Route path="/search" element={<SearchPage />}>
       {searchPage}
     </Route>
-    ;
     <Route path="/settings" element={<UserSettingsPage />} />
   </FlatRoutes>
 );