Merge branch 'master' into techdocs/addon-integration

Signed-off-by: Eric Peterson <ericpeterson@spotify.com>

plugins/techdocs/package.json

@@ -44,8 +44,7 @@
     "@backstage/integration": "^1.1.0-next.1",
     "@backstage/integration-react": "^1.0.1-next.1",
     "@backstage/plugin-catalog-react": "^1.0.1-next.2",
-    "@backstage/plugin-catalog": "^1.1.0-next.2",
-    "@backstage/plugin-search": "^0.7.5-next.0",
+    "@backstage/plugin-search-react": "^0.0.0",
     "@backstage/plugin-techdocs-react": "^0.0.0",
     "@backstage/theme": "^0.2.15",
     "@backstage/version-bridge": "^1.0.0",

plugins/techdocs/src/search/components/TechDocsSearch.test.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { ApiProvider } from '@backstage/core-app-api';
-import { searchApiRef } from '@backstage/plugin-search';
+import { searchApiRef } from '@backstage/plugin-search-react';
 import { TestApiRegistry, wrapInTestApp } from '@backstage/test-utils';
 import {
   act,

plugins/techdocs/src/search/components/TechDocsSearch.tsx

@@ -15,7 +15,10 @@
  */
 
 import { CompoundEntityRef } from '@backstage/catalog-model';
-import { SearchContextProvider, useSearch } from '@backstage/plugin-search';
+import {
+  SearchContextProvider,
+  useSearch,
+} from '@backstage/plugin-search-react';
 import {
   makeStyles,
   CircularProgress,