Createa @backstage/plugin-catalog-common-react package

plugins/rollbar/src/components/RollbarHome/RollbarHome.test.tsx

@@ -21,7 +21,10 @@ import {
   ConfigApi,
   configApiRef,
 } from '@backstage/core';
-import { catalogApiRef, CatalogApi } from '@backstage/plugin-catalog';
+import {
+  catalogApiRef,
+  CatalogApi,
+} from '@backstage/plugin-catalog-common-react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import { RollbarApi, rollbarApiRef } from '../../api/RollbarApi';

plugins/rollbar/src/components/RollbarProjectPage/RollbarProjectPage.test.tsx

@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
-import * as React from 'react';
 import {
   ApiProvider,
   ApiRegistry,
   ConfigApi,
   configApiRef,
 } from '@backstage/core';
+import {
+  CatalogApi,
+  catalogApiRef,
+} from '@backstage/plugin-catalog-common-react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
+import * as React from 'react';
 import { RollbarApi, rollbarApiRef } from '../../api/RollbarApi';
 import { RollbarTopActiveItem } from '../../api/types';
 import { RollbarProjectPage } from './RollbarProjectPage';
-import { catalogApiRef, CatalogApi } from '@backstage/plugin-catalog';
 
 describe('RollbarProjectPage component', () => {
   const items: RollbarTopActiveItem[] = [

plugins/rollbar/src/hooks/useCatalogEntity.ts

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { useAsync } from 'react-use';
 import { useApi } from '@backstage/core';
 import {
   catalogApiRef,
   useEntityCompoundName,
-} from '@backstage/plugin-catalog';
+} from '@backstage/plugin-catalog-common-react';
+import { useAsync } from 'react-use';
 
 export function useCatalogEntity() {
   const catalogApi = useApi(catalogApiRef);

plugins/rollbar/src/hooks/useRollbarEntities.ts

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+import { configApiRef, useApi } from '@backstage/core';
+import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
 import { useAsync } from 'react-use';
-import { useApi, configApiRef } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog';
 import { ROLLBAR_ANNOTATION } from '../constants';
 
 export function useRollbarEntities() {