dev-utils,test-utils,app: update to use app-defaults

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

packages/app/src/App.tsx

@@ -26,12 +26,12 @@ import {
   RELATION_PART_OF,
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
-import { createApp, FlatRoutes } from '@backstage/core-app-api';
+import { createApp } from '@backstage/app-defaults';
+import { FlatRoutes } from '@backstage/core-app-api';
 import {
   AlertDisplay,
   OAuthRequestDialog,
   SignInPage,
-  withDefaults,
 } from '@backstage/core-components';
 import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
 import {
@@ -87,46 +87,44 @@ import * as plugins from './plugins';
 
 import { techDocsPage } from './components/techdocs/TechDocsPage';
 
-const app = createApp(
-  withDefaults({
-    apis,
-    plugins: Object.values(plugins),
-    icons: {
-      // Custom icon example
-      alert: AlarmIcon,
+const app = createApp({
+  apis,
+  plugins: Object.values(plugins),
+  icons: {
+    // Custom icon example
+    alert: AlarmIcon,
+  },
+  components: {
+    SignInPage: props => {
+      return (
+        <SignInPage
+          {...props}
+          providers={['guest', 'custom', ...providers]}
+          title="Select a sign-in method"
+          align="center"
+        />
+      );
     },
-    components: {
-      SignInPage: props => {
-        return (
-          <SignInPage
-            {...props}
-            providers={['guest', 'custom', ...providers]}
-            title="Select a sign-in method"
-            align="center"
-          />
-        );
-      },
-    },
-    bindRoutes({ bind }) {
-      bind(catalogPlugin.externalRoutes, {
-        createComponent: scaffolderPlugin.routes.root,
-        viewTechDoc: techdocsPlugin.routes.docRoot,
-      });
-      bind(catalogGraphPlugin.externalRoutes, {
-        catalogEntity: catalogPlugin.routes.catalogEntity,
-      });
-      bind(apiDocsPlugin.externalRoutes, {
-        createComponent: scaffolderPlugin.routes.root,
-      });
-      bind(explorePlugin.externalRoutes, {
-        catalogEntity: catalogPlugin.routes.catalogEntity,
-      });
-      bind(scaffolderPlugin.externalRoutes, {
-        registerComponent: catalogImportPlugin.routes.importPage,
-      });
-    },
-  }),
-);
+  },
+  bindRoutes({ bind }) {
+    bind(catalogPlugin.externalRoutes, {
+      createComponent: scaffolderPlugin.routes.root,
+      viewTechDoc: techdocsPlugin.routes.docRoot,
+    });
+    bind(catalogGraphPlugin.externalRoutes, {
+      catalogEntity: catalogPlugin.routes.catalogEntity,
+    });
+    bind(apiDocsPlugin.externalRoutes, {
+      createComponent: scaffolderPlugin.routes.root,
+    });
+    bind(explorePlugin.externalRoutes, {
+      catalogEntity: catalogPlugin.routes.catalogEntity,
+    });
+    bind(scaffolderPlugin.externalRoutes, {
+      registerComponent: catalogImportPlugin.routes.importPage,
+    });
+  },
+});
 
 const AppProvider = app.getProvider();
 const AppRouter = app.getRouter();