Rename from @backstage/plugin-catalog-common-react to @backstage/plugin-catalog-react

.changeset/wet-suits-live.md

@@ -16,4 +16,4 @@
 '@backstage/plugin-techdocs': patch
 ---
 
-Switch dependency from `@backstage/plugin-catalog` to `@backstage/plugin-catalog-common-react`.
+Switch dependency from `@backstage/plugin-catalog` to `@backstage/plugin-catalog-react`.

.changeset/wild-cows-exercise.md

@@ -4,5 +4,5 @@
 ---
 
 `@backstage/plugin-catalog` stopped exporting hooks and helpers for other
-plugins. They are migrated to `@backstage/plugin-catalog-common-react`.
+plugins. They are migrated to `@backstage/plugin-catalog-react`.
 Change both your dependencies and imports to the new package.

packages/app/package.json

@@ -9,7 +9,7 @@
     "@backstage/core": "^0.5.0",
     "@backstage/plugin-api-docs": "^0.4.3",
     "@backstage/plugin-catalog": "^0.2.14",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/plugin-catalog-import": "^0.3.6",
     "@backstage/plugin-circleci": "^0.2.6",
     "@backstage/plugin-cloudbuild": "^0.2.7",

packages/app/src/components/catalog/EntityPage.tsx

@@ -28,7 +28,7 @@ import {
   ProvidingComponentsCard,
 } from '@backstage/plugin-api-docs';
 import { AboutCard, EntityPageLayout } from '@backstage/plugin-catalog';
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   isPluginApplicableToEntity as isCircleCIAvailable,
   Router as CircleCIRouter,

packages/create-app/src/lib/versions.ts

@@ -42,7 +42,7 @@ import { version as pluginApiDocs } from '../../../../plugins/api-docs/package.j
 import { version as pluginAppBackend } from '../../../../plugins/app-backend/package.json';
 import { version as pluginAuthBackend } from '../../../../plugins/auth-backend/package.json';
 import { version as pluginCatalog } from '../../../../plugins/catalog/package.json';
-import { version as pluginCatalogCommonReact } from '../../../../plugins/catalog-common-react/package.json';
+import { version as pluginCatalogReact } from '../../../../plugins/catalog-react/package.json';
 import { version as pluginCatalogBackend } from '../../../../plugins/catalog-backend/package.json';
 import { version as pluginCatalogImport } from '../../../../plugins/catalog-import/package.json';
 import { version as pluginCircleci } from '../../../../plugins/circleci/package.json';
@@ -69,7 +69,7 @@ export const packageVersions = {
   '@backstage/plugin-app-backend': pluginAppBackend,
   '@backstage/plugin-auth-backend': pluginAuthBackend,
   '@backstage/plugin-catalog': pluginCatalog,
-  '@backstage/plugin-catalog-common-react': pluginCatalogCommonReact,
+  '@backstage/plugin-catalog-react': pluginCatalogReact,
   '@backstage/plugin-catalog-backend': pluginCatalogBackend,
   '@backstage/plugin-catalog-import': pluginCatalogImport,
   '@backstage/plugin-circleci': pluginCircleci,

packages/create-app/templates/default-app/packages/app/package.json.hbs

@@ -10,7 +10,7 @@
     "@backstage/core": "^{{version '@backstage/core'}}",
     "@backstage/plugin-api-docs": "^{{version '@backstage/plugin-api-docs'}}",
     "@backstage/plugin-catalog": "^{{version '@backstage/plugin-catalog'}}",
-    "@backstage/plugin-catalog-common-react": "^{{version '@backstage/plugin-catalog-common-react'}}",
+    "@backstage/plugin-catalog-react": "^{{version '@backstage/plugin-catalog-react'}}",
     "@backstage/plugin-catalog-import": "^{{version '@backstage/plugin-catalog-import'}}",
     "@backstage/plugin-scaffolder": "^{{version '@backstage/plugin-scaffolder'}}",
     "@backstage/plugin-techdocs": "^{{version '@backstage/plugin-techdocs'}}",

packages/create-app/templates/default-app/packages/app/src/components/catalog/EntityPage.tsx

@@ -27,7 +27,7 @@ import {
 } from '@backstage/plugin-catalog';
 import {
   useEntity
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import {
   isPluginApplicableToEntity as isCircleCIAvailable, Router as CircleCIRouter
 } from '@backstage/plugin-circleci';

plugins/api-docs/package.json

@@ -32,7 +32,7 @@
     "@asyncapi/react-component": "^0.18.2",
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-icons/font": "^1.0.2",
     "@material-ui/core": "^4.11.0",

plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.test.tsx

@@ -16,10 +16,7 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry, storageApiRef } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { MockStorageApi, wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import React from 'react';

plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.tsx

@@ -15,7 +15,7 @@
  */
 
 import { Content, ContentHeader, SupportButton, useApi } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Button } from '@material-ui/core';
 import React from 'react';
 import { Link as RouterLink } from 'react-router-dom';

plugins/api-docs/src/components/ApisCards/ConsumedApisCard.test.tsx

@@ -16,10 +16,7 @@
 
 import { Entity, RELATION_CONSUMES_API } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';

plugins/api-docs/src/components/ApisCards/ProvidedApisCard.test.tsx

@@ -16,10 +16,7 @@
 
 import { Entity, RELATION_PROVIDES_API } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';

plugins/api-docs/src/components/ComponentsCards/ConsumingComponentsCard.test.tsx

@@ -16,10 +16,7 @@
 
 import { Entity, RELATION_API_CONSUMED_BY } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';

plugins/api-docs/src/components/ComponentsCards/ProvidingComponentsCard.test.tsx

@@ -16,10 +16,7 @@
 
 import { Entity, RELATION_API_PROVIDED_BY } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';

plugins/api-docs/src/components/EntityLink/EntityLink.tsx

@@ -18,7 +18,7 @@ import { Entity } from '@backstage/catalog-model';
 import {
   entityRoute,
   entityRouteParams,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { Link } from '@material-ui/core';
 import React, { PropsWithChildren } from 'react';
 import { generatePath, Link as RouterLink } from 'react-router-dom';

plugins/api-docs/src/components/useRelatedEntities.ts

@@ -15,7 +15,7 @@
  */
 import { Entity } from '@backstage/catalog-model';
 import { useApi } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { useAsyncRetry } from 'react-use';
 
 // TODO: Maybe this hook is interesting for others too?

plugins/catalog-import/package.json

@@ -33,7 +33,7 @@
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
     "@backstage/integration": "^0.3.1",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/catalog-import/src/components/ComponentConfigDisplay.tsx

@@ -24,7 +24,7 @@ import {
 import {
   entityRoute,
   entityRouteParams,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import {
   Button,
   CircularProgress,

plugins/catalog-import/src/components/ImportComponentForm.test.tsx

@@ -19,10 +19,7 @@ import {
   DiscoveryApi,
   errorApiRef,
 } from '@backstage/core';
-import {
-  catalogApiRef,
-  CatalogClient,
-} from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef, CatalogClient } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import React from 'react';

plugins/catalog-import/src/components/ImportComponentForm.tsx

@@ -15,7 +15,7 @@
  */
 
 import { errorApiRef, useApi } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { BackstageTheme } from '@backstage/theme';
 import {
   Button,

plugins/catalog-import/src/components/ImportComponentPage.test.tsx

@@ -19,10 +19,7 @@ import {
   configApiRef,
   errorApiRef,
 } from '@backstage/core';
-import {
-  catalogApiRef,
-  CatalogClient,
-} from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef, CatalogClient } from '@backstage/plugin-catalog-react';
 import { msw, renderInTestApp } from '@backstage/test-utils';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
 import { rest } from 'msw';

plugins/catalog-react/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@backstage/plugin-catalog-common-react",
+  "name": "@backstage/plugin-catalog-react",
   "version": "0.0.1",
   "main": "src/index.ts",
   "types": "src/index.ts",

plugins/catalog/package.json

@@ -33,7 +33,7 @@
     "@backstage/catalog-client": "^0.3.5",
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/plugin-scaffolder": "^0.4.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",

plugins/catalog/src/components/AboutCard/AboutContent.tsx

@@ -19,7 +19,7 @@ import {
   RELATION_OWNED_BY,
   RELATION_PART_OF,
 } from '@backstage/catalog-model';
-import { EntityRefLinks } from '@backstage/plugin-catalog-common-react';
+import { EntityRefLinks } from '@backstage/plugin-catalog-react';
 import { Chip, Grid, makeStyles, Typography } from '@material-ui/core';
 import React from 'react';
 import { getEntityRelations } from '../getEntityRelations';

plugins/catalog/src/components/CatalogPage/CatalogPage.tsx

@@ -22,7 +22,7 @@ import {
   SupportButton,
   useApi,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { rootRoute as scaffolderRootRoute } from '@backstage/plugin-scaffolder';
 import { Button, makeStyles } from '@material-ui/core';
 import SettingsIcon from '@material-ui/icons/Settings';

plugins/catalog/src/components/CatalogTable/CatalogTable.tsx

@@ -24,7 +24,7 @@ import {
   EntityRefLink,
   EntityRefLinks,
   formatEntityRefTitle,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { Chip } from '@material-ui/core';
 import Edit from '@material-ui/icons/Edit';
 import OpenInNew from '@material-ui/icons/OpenInNew';

plugins/catalog/src/components/EntityLayout/EntityLayout.test.tsx

@@ -21,10 +21,7 @@ import {
   ApiProvider,
   ApiRegistry,
 } from '@backstage/core';
-import {
-  catalogApiRef,
-  EntityContext,
-} from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef, EntityContext } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, withLogCollector } from '@backstage/test-utils';
 import { fireEvent } from '@testing-library/react';
 import React from 'react';

plugins/catalog/src/components/EntityLayout/EntityLayout.tsx

@@ -26,7 +26,7 @@ import {
 import {
   EntityContext,
   useEntityCompoundName,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { Box } from '@material-ui/core';
 import { Alert } from '@material-ui/lab';
 import React, {

plugins/catalog/src/components/EntityLoaderProvider/EntityLoaderProvider.tsx

@@ -16,7 +16,7 @@
 import {
   EntityContext,
   useEntityFromUrl,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import React, { ReactNode } from 'react';
 
 export const EntityLoaderProvider = ({ children }: { children: ReactNode }) => {

plugins/catalog/src/components/EntityPageLayout/EntityPageLayout.tsx

@@ -22,7 +22,7 @@ import { useNavigate } from 'react-router';
 import {
   EntityContext,
   useEntityCompoundName,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { EntityContextMenu } from '../EntityContextMenu/EntityContextMenu';
 import { FavouriteEntity } from '../FavouriteEntity/FavouriteEntity';
 import { UnregisterEntityDialog } from '../UnregisterEntityDialog/UnregisterEntityDialog';

plugins/catalog/src/components/EntityProvider/EntityProvider.tsx

@@ -15,7 +15,7 @@
  */
 import { Entity } from '@backstage/catalog-model';
 import React, { ReactNode } from 'react';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 
 type EntityProviderProps = {
   entity: Entity;

plugins/catalog/src/components/EntitySwitch/EntitySwitch.test.tsx

@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 import { render } from '@testing-library/react';
 import React from 'react';
 import { isKind } from './conditions';

plugins/catalog/src/components/EntitySwitch/EntitySwitch.tsx

@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   Children,
   Fragment,

plugins/catalog/src/components/Router.tsx

@@ -19,7 +19,7 @@ import {
   entityRoute,
   rootRoute,
   useEntity,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { Link, Typography } from '@material-ui/core';
 import React, { ComponentType } from 'react';
 import { Navigate, Route, Routes, useParams } from 'react-router';

plugins/catalog/src/components/UnregisterEntityDialog/UnregisterEntityDialog.tsx

@@ -19,7 +19,7 @@ import { alertApiRef, configApiRef, Progress, useApi } from '@backstage/core';
 import {
   catalogApiRef,
   formatEntityRefTitle,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import {
   Button,
   Dialog,

plugins/catalog/src/components/useOwnUser.ts

@@ -16,7 +16,7 @@
 
 import { UserEntity } from '@backstage/catalog-model';
 import { identityApiRef, useApi } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { useAsync } from 'react-use';
 import { AsyncState } from 'react-use/lib/useAsync';
 

plugins/catalog/src/extensions.tsx

@@ -18,7 +18,7 @@ import { createRoutableExtension } from '@backstage/core';
 import {
   catalogRouteRef,
   entityRouteRef,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { plugin } from './plugin';
 
 export const CatalogIndexPage = plugin.provide(

plugins/catalog/src/filter/EntityFilterGroupsProvider.tsx

@@ -16,7 +16,7 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { useApi } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useAsyncFn } from 'react-use';
 import { filterGroupsContext, FilterGroupsContext } from './context';

plugins/catalog/src/plugin.ts

@@ -24,7 +24,7 @@ import {
   catalogApiRef,
   catalogRouteRef,
   entityRouteRef,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 
 export const plugin = createPlugin({
   id: 'catalog',

plugins/circleci/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/circleci/src/state/useBuilds.ts

@@ -15,7 +15,7 @@
  */
 
 import { errorApiRef, useApi } from '@backstage/core';
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import { BuildSummary, GitType } from 'circleci-api';
 import { getOr } from 'lodash/fp';
 import { useCallback, useEffect, useState } from 'react';

plugins/jenkins/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/jenkins/src/components/useProjectSlugFromEntity.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import { JENKINS_ANNOTATION } from '../constants';
 
 export const useProjectSlugFromEntity = () => {

plugins/kafka/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/kafka/src/components/ConsumerGroupOffsets/useConsumerGroupsForEntity.test.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { Entity } from '@backstage/catalog-model';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 import { renderHook } from '@testing-library/react-hooks';
 import React, { PropsWithChildren } from 'react';
 import { useConsumerGroupsForEntity } from './useConsumerGroupsForEntity';

plugins/kafka/src/components/ConsumerGroupOffsets/useConsumerGroupsForEntity.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import { useMemo } from 'react';
 import { KAFKA_CONSUMER_GROUP_ANNOTATION } from '../../constants';
 

plugins/kafka/src/components/ConsumerGroupOffsets/useConsumerGroupsOffsetsForEntity.test.tsx

@@ -15,7 +15,7 @@
  */
 import { Entity } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 import { renderHook } from '@testing-library/react-hooks';
 import { when } from 'jest-when';
 import React, { PropsWithChildren } from 'react';

plugins/lighthouse/package.json

@@ -34,7 +34,7 @@
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/config": "^0.1.2",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/lighthouse/src/components/AuditList/AuditListForEntity.test.tsx

@@ -16,7 +16,7 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';
 import { render } from '@testing-library/react';

plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx

@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';
 import { render } from '@testing-library/react';

plugins/lighthouse/src/hooks/useWebsiteForEntity.test.tsx

@@ -15,7 +15,7 @@
  */
 import { Entity } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
-import { EntityContext } from '@backstage/plugin-catalog-common-react';
+import { EntityContext } from '@backstage/plugin-catalog-react';
 import { renderHook } from '@testing-library/react-hooks';
 import React, { PropsWithChildren } from 'react';
 import { lighthouseApiRef, WebsiteListResponse } from '../api';

plugins/lighthouse/src/hooks/useWebsiteForEntity.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { errorApiRef, useApi } from '@backstage/core';
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import { useAsync } from 'react-use';
 import { LIGHTHOUSE_WEBSITE_URL_ANNOTATION } from '../../constants';
 import { lighthouseApiRef } from '../api';

plugins/org/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/org/src/components/Cards/Group/GroupProfile/GroupProfileCard.tsx

@@ -21,7 +21,7 @@ import {
   RELATION_PARENT_OF,
 } from '@backstage/catalog-model';
 import { Avatar, InfoCard } from '@backstage/core';
-import { entityRouteParams } from '@backstage/plugin-catalog-common-react';
+import { entityRouteParams } from '@backstage/plugin-catalog-react';
 import { Box, Grid, Link, Tooltip, Typography } from '@material-ui/core';
 import AccountTreeIcon from '@material-ui/icons/AccountTree';
 import EmailIcon from '@material-ui/icons/Email';

plugins/org/src/components/Cards/Group/MembersList/MembersListCard.test.tsx

@@ -16,10 +16,7 @@
 
 import { Entity, GroupEntity } from '@backstage/catalog-model';
 import { ApiProvider, ApiRegistry } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderWithEffects, wrapInTestApp } from '@backstage/test-utils';
 import React from 'react';
 import { MembersListCard } from './MembersListCard';

plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx

@@ -23,7 +23,7 @@ import { Avatar, InfoCard, Progress, useApi } from '@backstage/core';
 import {
   catalogApiRef,
   entityRouteParams,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import {
   Box,
   createStyles,

plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.tsx

@@ -17,7 +17,7 @@
 import React from 'react';
 import { InfoCard, useApi, Progress } from '@backstage/core';
 import { Entity } from '@backstage/catalog-model';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { useAsync } from 'react-use';
 import Alert from '@material-ui/lab/Alert';
 import {

plugins/org/src/components/Cards/User/UserProfileCard/UserProfileCard.tsx

@@ -19,7 +19,7 @@ import {
   UserEntity,
 } from '@backstage/catalog-model';
 import { Avatar, InfoCard } from '@backstage/core';
-import { entityRouteParams } from '@backstage/plugin-catalog-common-react';
+import { entityRouteParams } from '@backstage/plugin-catalog-react';
 import { Box, Grid, Link, Tooltip, Typography } from '@material-ui/core';
 import EmailIcon from '@material-ui/icons/Email';
 import GroupIcon from '@material-ui/icons/Group';

plugins/register-component/package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.test.tsx

@@ -20,7 +20,7 @@ import {
   createRouteRef,
   errorApiRef,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';
 import { render, screen } from '@testing-library/react';

plugins/register-component/src/components/RegisterComponentPage/RegisterComponentPage.tsx

@@ -26,7 +26,7 @@ import {
   SupportButton,
   useApi,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Grid, makeStyles } from '@material-ui/core';
 import React, { useState } from 'react';
 import { useMountedState } from 'react-use';

plugins/register-component/src/components/RegisterComponentResultDialog/RegisterComponentResultDialog.tsx

@@ -19,7 +19,7 @@ import { RouteRef, StructuredMetadataTable } from '@backstage/core';
 import {
   entityRoute,
   entityRouteParams,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import {
   Button,
   Dialog,

plugins/rollbar/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

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

@@ -21,10 +21,7 @@ import {
   ConfigApi,
   configApiRef,
 } from '@backstage/core';
-import {
-  catalogApiRef,
-  CatalogApi,
-} from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef, CatalogApi } from '@backstage/plugin-catalog-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

@@ -20,10 +20,7 @@ import {
   ConfigApi,
   configApiRef,
 } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import * as React from 'react';

plugins/rollbar/src/hooks/useCatalogEntity.ts

@@ -18,7 +18,7 @@ import { useApi } from '@backstage/core';
 import {
   catalogApiRef,
   useEntityCompoundName,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { useAsync } from 'react-use';
 
 export function useCatalogEntity() {

plugins/rollbar/src/hooks/useRollbarEntities.ts

@@ -15,7 +15,7 @@
  */
 
 import { configApiRef, useApi } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { useAsync } from 'react-use';
 import { ROLLBAR_ANNOTATION } from '../constants';
 

plugins/scaffolder/package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx

@@ -27,7 +27,7 @@ import {
   useApi,
   WarningPanel,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Button, Grid, Link, Typography } from '@material-ui/core';
 import React, { useEffect } from 'react';
 import { Link as RouterLink } from 'react-router-dom';

plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { renderInTestApp, renderWithEffects } from '@backstage/test-utils';
 import { lightTheme } from '@backstage/theme';
 import { ThemeProvider } from '@material-ui/core';

plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx

@@ -27,7 +27,7 @@ import {
   catalogApiRef,
   entityRoute,
   entityRouteParams,
-} from '@backstage/plugin-catalog-common-react';
+} from '@backstage/plugin-catalog-react';
 import { LinearProgress } from '@material-ui/core';
 import { IChangeEvent } from '@rjsf/core';
 import parseGitUrl from 'git-url-parse';

plugins/search/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@backstage/core": "^0.5.0",
     "@backstage/catalog-model": "^0.7.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/search/src/apis.ts

@@ -15,7 +15,7 @@
  */
 
 import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
-import { CatalogApi } from '@backstage/plugin-catalog-common-react';
+import { CatalogApi } from '@backstage/plugin-catalog-react';
 
 export type Result = {
   name: string;

plugins/search/src/components/SearchResult/SearchResult.tsx

@@ -21,7 +21,7 @@ import {
   TableColumn,
   useApi,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Divider, Grid, makeStyles, Typography } from '@material-ui/core';
 import { Alert } from '@material-ui/lab';
 import React, { useEffect, useState } from 'react';

plugins/sentry/dev/index.tsx

@@ -17,7 +17,7 @@
 import { Entity } from '@backstage/catalog-model';
 import { Content, Header, Page } from '@backstage/core';
 import { createDevApp, EntityGridItem } from '@backstage/dev-utils';
-import { EntityProvider } from '@backstage/plugin-catalog-common-react';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { Grid } from '@material-ui/core';
 import React from 'react';
 import {

plugins/sentry/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/sentry/src/extensions.tsx

@@ -18,7 +18,7 @@ import {
   createComponentExtension,
   createRoutableExtension,
 } from '@backstage/core';
-import { useEntity } from '@backstage/plugin-catalog-common-react';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import React from 'react';
 import { plugin, rootRouteRef } from './plugin';
 

plugins/techdocs/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog-common-react": "^0.0.1",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/test-utils": "^0.1.6",
     "@backstage/theme": "^0.2.2",
     "@backstage/techdocs-common": "^0.3.6",

plugins/techdocs/src/reader/components/TechDocsHome.test.tsx

@@ -15,10 +15,7 @@
  */
 
 import { ApiProvider, ApiRegistry } from '@backstage/core';
-import {
-  CatalogApi,
-  catalogApiRef,
-} from '@backstage/plugin-catalog-common-react';
+import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import React from 'react';

plugins/techdocs/src/reader/components/TechDocsHome.tsx

@@ -22,7 +22,7 @@ import {
   Progress,
   useApi,
 } from '@backstage/core';
-import { catalogApiRef } from '@backstage/plugin-catalog-common-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Grid } from '@material-ui/core';
 import React from 'react';
 import { generatePath, useNavigate } from 'react-router-dom';