Merge pull request #10937 from backstage/rugvip/app-api

search-react,techdocs: remove core-app-api dependency

.changeset/spotty-plums-rule.md

@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-search-react': patch
+'@backstage/plugin-techdocs': patch
+---
+
+Removed dependency on `@backstage/core-app-api`.

plugins/search-react/package.json

@@ -33,7 +33,6 @@
   "dependencies": {
     "@backstage/plugin-search-common": "^0.3.3",
     "@backstage/core-plugin-api": "^1.0.1",
-    "@backstage/core-app-api": "^1.0.1",
     "@backstage/version-bridge": "^1.0.1",
     "react-use": "^17.3.2",
     "@backstage/types": "^1.0.0"
@@ -43,6 +42,7 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
+    "@backstage/core-app-api": "^1.0.1",
     "@backstage/test-utils": "^1.0.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/react-hooks": "^8.0.0",

plugins/techdocs/package.json

@@ -38,7 +38,6 @@
     "@backstage/catalog-model": "^1.0.1",
     "@backstage/config": "^1.0.0",
     "@backstage/core-components": "^0.9.3",
-    "@backstage/core-app-api": "^1.0.1",
     "@backstage/core-plugin-api": "^1.0.1",
     "@backstage/errors": "^1.0.0",
     "@backstage/integration": "^1.1.0",

plugins/techdocs/src/Router.tsx

@@ -18,7 +18,6 @@ import React, { PropsWithChildren } from 'react';
 import { Route, Routes } from 'react-router-dom';
 
 import { Entity } from '@backstage/catalog-model';
-import { FlatRoutes } from '@backstage/core-app-api';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { MissingAnnotationEmptyState } from '@backstage/core-components';
 
@@ -69,10 +68,8 @@ export const EmbeddedDocsRouter = (props: PropsWithChildren<{}>) => {
   }
 
   return (
-    <FlatRoutes>
-      <Route path="/*" element={<EntityPageDocs entity={entity} />}>
-        {children}
-      </Route>
-    </FlatRoutes>
+    <Routes>
+      <Route element={<EntityPageDocs entity={entity} />}>{children}</Route>
+    </Routes>
   );
 };