Merge branch 'master' into techdocs/addon-integration

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

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,