apply core-imports codemod to all packages and plugins

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>

plugins/api-docs/dev/index.tsx

@@ -15,7 +15,6 @@
  */
 
 import { ApiEntity, Entity } from '@backstage/catalog-model';
-import { Content, Header, Page } from '@backstage/core';
 import { createDevApp } from '@backstage/dev-utils';
 import { catalogApiRef, EntityProvider } from '@backstage/plugin-catalog-react';
 import React from 'react';
@@ -29,6 +28,7 @@ import asyncapiApiEntity from './asyncapi-example-api.yaml';
 import graphqlApiEntity from './graphql-example-api.yaml';
 import openapiApiEntity from './openapi-example-api.yaml';
 import otherApiEntity from './other-example-api.yaml';
+import { Content, Header, Page } from '@backstage/core-components';
 
 const mockEntities = ([
   openapiApiEntity,

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

@@ -15,7 +15,6 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
@@ -23,6 +22,7 @@ import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { OpenApiDefinitionWidget } from '../OpenApiDefinitionWidget';
 import { ApiDefinitionCard } from './ApiDefinitionCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ApiDefinitionCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {

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

@@ -15,13 +15,15 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { CardTab, TabbedCard, useApi } from '@backstage/core';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import { Alert } from '@material-ui/lab';
 import React from 'react';
 import { apiDocsConfigRef } from '../../config';
 import { PlainApiDefinitionWidget } from '../PlainApiDefinitionWidget';
 
+import { CardTab, TabbedCard } from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+
 type Props = {
   /** @deprecated The entity is now grabbed from context instead */
   apiEntity?: ApiEntity;

plugins/api-docs/src/components/ApiDefinitionCard/ApiTypeTitle.test.tsx

@@ -15,11 +15,11 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { renderInTestApp } from '@backstage/test-utils';
 import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { ApiTypeTitle } from './ApiTypeTitle';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ApiTypeTitle />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {

plugins/api-docs/src/components/ApiDefinitionCard/ApiTypeTitle.tsx

@@ -15,9 +15,9 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { useApi } from '@backstage/core';
 import React from 'react';
 import { apiDocsConfigRef } from '../../config';
+import { useApi } from '@backstage/core-plugin-api';
 
 export const ApiTypeTitle = ({ apiEntity }: { apiEntity: ApiEntity }) => {
   const config = useApi(apiDocsConfigRef);

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

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-import { Header, Page, useApi, configApiRef } from '@backstage/core';
 import React from 'react';
 
+import { Header, Page } from '@backstage/core-components';
+import { useApi, configApiRef } from '@backstage/core-plugin-api';
+
 type Props = {
   children?: React.ReactNode;
 };

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

@@ -15,14 +15,6 @@
  */
 
 import { Entity, RELATION_MEMBER_OF } from '@backstage/catalog-model';
-import {
-  ApiProvider,
-  ApiRegistry,
-  storageApiRef,
-  ConfigApi,
-  configApiRef,
-  ConfigReader,
-} from '@backstage/core';
 import { CatalogApi, catalogApiRef } from '@backstage/plugin-catalog-react';
 import { MockStorageApi, wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
@@ -30,6 +22,17 @@ import React from 'react';
 import { apiDocsConfigRef } from '../../config';
 import { ApiExplorerPage } from './ApiExplorerPage';
 
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
+import {
+  storageApiRef,
+  ConfigApi,
+  configApiRef,
+} from '@backstage/core-plugin-api';
+
 describe('ApiCatalogPage', () => {
   const catalogApi: Partial<CatalogApi> = {
     getEntities: () =>

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

@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  Content,
-  ContentHeader,
-  SupportButton,
-  TableColumn,
-  useRouteRef,
-} from '@backstage/core';
 import {
   EntityKindPicker,
   EntityLifecyclePicker,
@@ -38,6 +31,14 @@ import { Link as RouterLink } from 'react-router-dom';
 import { createComponentRouteRef } from '../../routes';
 import { ApiExplorerLayout } from './ApiExplorerLayout';
 
+import {
+  Content,
+  ContentHeader,
+  SupportButton,
+  TableColumn,
+} from '@backstage/core-components';
+import { useRouteRef } from '@backstage/core-plugin-api';
+
 const useStyles = makeStyles(theme => ({
   contentWrapper: {
     display: 'grid',

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_CONSUMES_API } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -26,6 +25,7 @@ import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { ConsumedApisCard } from './ConsumedApisCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ConsumedApisCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {

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

@@ -19,13 +19,6 @@ import {
   Entity,
   RELATION_CONSUMES_API,
 } from '@backstage/catalog-model';
-import {
-  CodeSnippet,
-  InfoCard,
-  Link,
-  Progress,
-  WarningPanel,
-} from '@backstage/core';
 import { Typography } from '@material-ui/core';
 import {
   EntityTable,
@@ -34,6 +27,13 @@ import {
 } from '@backstage/plugin-catalog-react';
 import React from 'react';
 import { apiEntityColumns } from './presets';
+import {
+  CodeSnippet,
+  InfoCard,
+  Link,
+  Progress,
+  WarningPanel,
+} from '@backstage/core-components';
 
 type Props = {
   /** @deprecated The entity is now grabbed from context instead */

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_HAS_PART } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -26,6 +25,7 @@ import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { HasApisCard } from './HasApisCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<HasApisCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {

plugins/api-docs/src/components/ApisCards/HasApisCard.tsx

@@ -15,14 +15,6 @@
  */
 
 import { ApiEntity, RELATION_HAS_PART } from '@backstage/catalog-model';
-import {
-  CodeSnippet,
-  InfoCard,
-  Link,
-  Progress,
-  TableColumn,
-  WarningPanel,
-} from '@backstage/core';
 import { Typography } from '@material-ui/core';
 import {
   EntityTable,
@@ -31,6 +23,14 @@ import {
 } from '@backstage/plugin-catalog-react';
 import React from 'react';
 import { createSpecApiTypeColumn } from './presets';
+import {
+  CodeSnippet,
+  InfoCard,
+  Link,
+  Progress,
+  TableColumn,
+  WarningPanel,
+} from '@backstage/core-components';
 
 type Props = {
   variant?: 'gridItem';

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_PROVIDES_API } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -26,6 +25,7 @@ import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ApiDocsConfig, apiDocsConfigRef } from '../../config';
 import { ProvidedApisCard } from './ProvidedApisCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ProvidedApisCard />', () => {
   const apiDocsConfig: jest.Mocked<ApiDocsConfig> = {

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

@@ -19,13 +19,6 @@ import {
   Entity,
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
-import {
-  CodeSnippet,
-  InfoCard,
-  Link,
-  Progress,
-  WarningPanel,
-} from '@backstage/core';
 import { Typography } from '@material-ui/core';
 import {
   EntityTable,
@@ -34,6 +27,13 @@ import {
 } from '@backstage/plugin-catalog-react';
 import React from 'react';
 import { apiEntityColumns } from './presets';
+import {
+  CodeSnippet,
+  InfoCard,
+  Link,
+  Progress,
+  WarningPanel,
+} from '@backstage/core-components';
 
 type Props = {
   /** @deprecated The entity is now grabbed from context instead */

plugins/api-docs/src/components/ApisCards/presets.tsx

@@ -15,10 +15,10 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { TableColumn } from '@backstage/core';
 import { EntityTable } from '@backstage/plugin-catalog-react';
 import React from 'react';
 import { ApiTypeTitle } from '../ApiDefinitionCard';
+import { TableColumn } from '@backstage/core-components';
 
 export function createSpecApiTypeColumn(): TableColumn<ApiEntity> {
   return {

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_API_CONSUMED_BY } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -25,6 +24,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ConsumingComponentsCard } from './ConsumingComponentsCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ConsumingComponentsCard />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {

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

@@ -19,13 +19,6 @@ import {
   Entity,
   RELATION_API_CONSUMED_BY,
 } from '@backstage/catalog-model';
-import {
-  CodeSnippet,
-  InfoCard,
-  Link,
-  Progress,
-  WarningPanel,
-} from '@backstage/core';
 import { Typography } from '@material-ui/core';
 import {
   EntityTable,
@@ -33,6 +26,13 @@ import {
   useRelatedEntities,
 } from '@backstage/plugin-catalog-react';
 import React from 'react';
+import {
+  CodeSnippet,
+  InfoCard,
+  Link,
+  Progress,
+  WarningPanel,
+} from '@backstage/core-components';
 
 type Props = {
   /** @deprecated The entity is now grabbed from context instead */

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_API_PROVIDED_BY } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -25,6 +24,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { ProvidingComponentsCard } from './ProvidingComponentsCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<ProvidingComponentsCard />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {

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

@@ -19,13 +19,6 @@ import {
   Entity,
   RELATION_API_PROVIDED_BY,
 } from '@backstage/catalog-model';
-import {
-  CodeSnippet,
-  InfoCard,
-  Link,
-  Progress,
-  WarningPanel,
-} from '@backstage/core';
 import { Typography } from '@material-ui/core';
 import {
   EntityTable,
@@ -33,6 +26,13 @@ import {
   useRelatedEntities,
 } from '@backstage/plugin-catalog-react';
 import React from 'react';
+import {
+  CodeSnippet,
+  InfoCard,
+  Link,
+  Progress,
+  WarningPanel,
+} from '@backstage/core-components';
 
 type Props = {
   /** @deprecated The entity is now grabbed from context instead */

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

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { Progress } from '@backstage/core';
 import { BackstageTheme } from '@backstage/theme';
 import { makeStyles } from '@material-ui/core/styles';
 import 'graphiql/graphiql.css';
 import { buildSchema } from 'graphql';
 import React, { Suspense } from 'react';
+import { Progress } from '@backstage/core-components';
 
 const GraphiQL = React.lazy(() => import('graphiql'));
 

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

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { CodeSnippet } from '@backstage/core';
 import React from 'react';
+import { CodeSnippet } from '@backstage/core-components';
 
 type Props = {
   definition: any;

plugins/api-docs/src/config.ts

@@ -15,8 +15,8 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
-import { createApiRef } from '@backstage/core';
 import { ApiDefinitionWidget } from './components/ApiDefinitionCard/ApiDefinitionWidget';
+import { createApiRef } from '@backstage/core-plugin-api';
 
 export const apiDocsConfigRef = createApiRef<ApiDocsConfig>({
   id: 'plugin.api-docs.config',

plugins/api-docs/src/plugin.ts

@@ -15,15 +15,15 @@
  */
 
 import { ApiEntity } from '@backstage/catalog-model';
+import { defaultDefinitionWidgets } from './components/ApiDefinitionCard';
+import { apiDocsConfigRef } from './config';
+import { createComponentRouteRef, rootRoute } from './routes';
 import {
   createApiFactory,
   createComponentExtension,
   createPlugin,
   createRoutableExtension,
-} from '@backstage/core';
-import { defaultDefinitionWidgets } from './components/ApiDefinitionCard';
-import { apiDocsConfigRef } from './config';
-import { createComponentRouteRef, rootRoute } from './routes';
+} from '@backstage/core-plugin-api';
 
 export const apiDocsPlugin = createPlugin({
   id: 'api-docs',

plugins/api-docs/src/routes.ts

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-import { createExternalRouteRef, createRouteRef } from '@backstage/core';
+import {
+  createExternalRouteRef,
+  createRouteRef,
+} from '@backstage/core-plugin-api';
 
 const NoIcon = () => null;
 

plugins/badges/src/api/BadgesClient.ts

@@ -15,11 +15,11 @@
  */
 
 import { generatePath } from 'react-router';
-import { DiscoveryApi, IdentityApi } from '@backstage/core';
 import { ResponseError } from '@backstage/errors';
 import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
 import { entityRoute } from '@backstage/plugin-catalog-react';
 import { BadgesApi, BadgeSpec } from './types';
+import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
 export class BadgesClient implements BadgesApi {
   private readonly discoveryApi: DiscoveryApi;

plugins/badges/src/api/types.ts

@@ -15,7 +15,7 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { createApiRef } from '@backstage/core';
+import { createApiRef } from '@backstage/core-plugin-api';
 
 export const badgesApiRef = createApiRef<BadgesApi>({
   id: 'plugin.badges.client',

plugins/badges/src/components/EntityBadgesDialog.test.tsx

@@ -16,17 +16,14 @@
 
 import React from 'react';
 import { Entity } from '@backstage/catalog-model';
-import {
-  ApiProvider,
-  ApiRegistry,
-  ErrorApi,
-  errorApiRef,
-} from '@backstage/core';
 import { renderWithEffects } from '@backstage/test-utils';
 import { BadgesApi, badgesApiRef } from '../api';
 import { EntityBadgesDialog } from './EntityBadgesDialog';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { ErrorApi, errorApiRef } from '@backstage/core-plugin-api';
+
 describe('EntityBadgesDialog', () => {
   it('should render', async () => {
     const mockApi: jest.Mocked<BadgesApi> = {

plugins/badges/src/components/EntityBadgesDialog.tsx

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  CodeSnippet,
-  Progress,
-  ResponseErrorPanel,
-  useApi,
-} from '@backstage/core';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import {
   Box,
@@ -36,6 +30,13 @@ import React from 'react';
 import { useAsync } from 'react-use';
 import { badgesApiRef } from '../api';
 
+import {
+  CodeSnippet,
+  Progress,
+  ResponseErrorPanel,
+} from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+
 type Props = {
   open: boolean;
   onClose?: () => any;

plugins/badges/src/plugin.ts

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { badgesApiRef, BadgesClient } from './api';
 import {
   createApiFactory,
   createComponentExtension,
   createPlugin,
   discoveryApiRef,
   identityApiRef,
-} from '@backstage/core';
-import { badgesApiRef, BadgesClient } from './api';
+} from '@backstage/core-plugin-api';
 
 export const badgesPlugin = createPlugin({
   id: 'badges',

plugins/bitrise/dev/index.tsx

@@ -15,7 +15,6 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { Content, Header, Page } from '@backstage/core';
 import { createDevApp, EntityGridItem } from '@backstage/dev-utils';
 import React from 'react';
 import { EntityBitriseContent } from '../src';
@@ -28,6 +27,7 @@ import {
 } from '../src/api/bitriseApi.model';
 import { BITRISE_APP_ANNOTATION } from '../src/components/BitriseBuildsComponent';
 import { bitriseApiRef } from '../src/plugin';
+import { Content, Header, Page } from '@backstage/core-components';
 
 const mockedPagingResponse: BitrisePagingResponse = {
   next: 'fae3232de3d2',

plugins/bitrise/src/api/bitriseApi.client.test.ts

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { UrlPatternDiscovery } from '@backstage/core';
 import { msw } from '@backstage/test-utils';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { BitriseClientApi } from './bitriseApi.client';
 import { BitriseApi } from './bitriseApi';
+import { UrlPatternDiscovery } from '@backstage/core-app-api';
 
 const server = setupServer();
 

plugins/bitrise/src/api/bitriseApi.client.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { DiscoveryApi } from '@backstage/core';
 import { BitriseApi } from './bitriseApi';
 import {
   BitriseBuildResponseItem,
@@ -28,6 +27,7 @@ import {
 import qs from 'qs';
 import { DateTime, Interval } from 'luxon';
 import { pickBy, identity } from 'lodash';
+import { DiscoveryApi } from '@backstage/core-plugin-api';
 
 export class BitriseClientApi implements BitriseApi {
   constructor(private readonly discoveryApi: DiscoveryApi) {}

plugins/bitrise/src/components/BitriseArtifactsComponent/BitriseArtifactsComponent.tsx

@@ -17,7 +17,6 @@
 import React from 'react';
 import { BitriseBuildResult } from '../../api/bitriseApi.model';
 import { Alert } from '@material-ui/lab';
-import { Progress } from '@backstage/core';
 import { BitriseDownloadArtifactComponent } from '../BitriseDownloadArtifactComponent';
 import { useBitriseArtifacts } from '../useBitriseArtifacts';
 import {
@@ -26,6 +25,7 @@ import {
   ListItemSecondaryAction,
   ListItemText,
 } from '@material-ui/core';
+import { Progress } from '@backstage/core-components';
 
 type BitriseArtifactsComponentComponentProps = {
   build: BitriseBuildResult;

plugins/bitrise/src/components/BitriseBuildsComponent/BitriseBuildsComponent.tsx

@@ -15,18 +15,18 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import {
-  Content,
-  ContentHeader,
-  MissingAnnotationEmptyState,
-  Page,
-} from '@backstage/core';
 import { useEntity } from '@backstage/plugin-catalog-react';
 import React, { useState } from 'react';
 import { useBitriseBuildWorkflows } from '../../hooks/useBitriseBuildWorkflows';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { BitriseBuildsTable } from '../BitriseBuildsTableComponent';
 import { Item, Select } from '../Select';
+import {
+  Content,
+  ContentHeader,
+  MissingAnnotationEmptyState,
+  Page,
+} from '@backstage/core-components';
 
 export type Props = {
   entity: Entity;

plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.test.tsx

@@ -15,13 +15,17 @@
  */
 
 import React from 'react';
-import { ApiProvider, ApiRegistry, UrlPatternDiscovery } from '@backstage/core';
 import { bitriseApiRef } from '../../plugin';
 import { BitriseClientApi } from '../../api/bitriseApi.client';
 import { setupServer } from 'msw/node';
 import { msw, renderInTestApp } from '@backstage/test-utils';
 import { useBitriseBuilds } from '../../hooks/useBitriseBuilds';
 import { BitriseBuildsTable } from './BitriseBuildsTableComponent';
+import {
+  ApiProvider,
+  ApiRegistry,
+  UrlPatternDiscovery,
+} from '@backstage/core-app-api';
 
 jest.mock('../../hooks/useBitriseBuilds', () => ({
   useBitriseBuilds: jest.fn(),

plugins/bitrise/src/components/BitriseBuildsTableComponent/BitriseBuildsTableComponent.tsx

@@ -15,17 +15,6 @@
  */
 
 import React, { useState } from 'react';
-import {
-  Table,
-  TableColumn,
-  Link,
-  SubvalueCell,
-  StatusOK,
-  StatusWarning,
-  StatusAborted,
-  StatusError,
-  StatusRunning,
-} from '@backstage/core';
 import { Alert } from '@material-ui/lab';
 import { Button } from '@material-ui/core';
 import GitHubIcon from '@material-ui/icons/GitHub';
@@ -36,6 +25,17 @@ import {
 } from '../../api/bitriseApi.model';
 import { BitriseBuildDetailsDialog } from '../BitriseBuildDetailsDialog';
 import { DateTime } from 'luxon';
+import {
+  Table,
+  TableColumn,
+  Link,
+  SubvalueCell,
+  StatusOK,
+  StatusWarning,
+  StatusAborted,
+  StatusError,
+  StatusRunning,
+} from '@backstage/core-components';
 
 type BitriseBuildsProps = {
   appName: string;

plugins/bitrise/src/components/useBitriseArtifactDetails.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { useApi } from '@backstage/core';
 import { useAsync } from 'react-use';
 import { BitriseBuildArtifactDetails } from '../api/bitriseApi.model';
 import { bitriseApiRef } from '../plugin';
+import { useApi } from '@backstage/core-plugin-api';
 
 export const useBitriseArtifactDetails = (
   appSlug: string,

plugins/bitrise/src/components/useBitriseArtifacts.ts

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { useApi } from '@backstage/core';
 import { useAsync } from 'react-use';
 import { BitriseBuildArtifact } from '../api/bitriseApi.model';
 import { bitriseApiRef } from '../plugin';
+import { useApi } from '@backstage/core-plugin-api';
 
 export const useBitriseArtifacts = (appSlug: string, buildSlug: string) => {
   const bitriseApi = useApi(bitriseApiRef);

plugins/bitrise/src/extensions.ts

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { createComponentExtension } from '@backstage/core';
 import { bitrisePlugin } from './plugin';
+import { createComponentExtension } from '@backstage/core-plugin-api';
 
 export const EntityBitriseContent = bitrisePlugin.provide(
   createComponentExtension({

plugins/bitrise/src/hooks/useBitriseBuildWorkflows.ts

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { useApi } from '@backstage/core';
 import { useAsync } from 'react-use';
 import { bitriseApiRef } from '../plugin';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { BitriseApp } from '../api/bitriseApi.model';
+import { useApi } from '@backstage/core-plugin-api';
 
 export const useBitriseBuildWorkflows = (
   appName: string,

plugins/bitrise/src/hooks/useBitriseBuilds.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { useApi } from '@backstage/core';
 import { useAsync } from 'react-use';
 import {
   BitriseApp,
@@ -23,6 +22,7 @@ import {
 } from '../api/bitriseApi.model';
 import { bitriseApiRef } from '../plugin';
 import { AsyncState } from 'react-use/lib/useAsync';
+import { useApi } from '@backstage/core-plugin-api';
 
 export const useBitriseBuilds = (
   appName: string,

plugins/bitrise/src/plugin.ts

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
+import { BitriseClientApi } from './api/bitriseApi.client';
+
+import { BitriseApi } from './api/bitriseApi';
 import {
   discoveryApiRef,
   createApiRef,
   createApiFactory,
   createPlugin,
-} from '@backstage/core';
-
-import { BitriseClientApi } from './api/bitriseApi.client';
-import { BitriseApi } from './api/bitriseApi';
+} from '@backstage/core-plugin-api';
 
 export const bitriseApiRef = createApiRef<BitriseApi>({
   id: 'plugin.bitrise.service',

plugins/catalog-import/dev/index.tsx

@@ -16,7 +16,6 @@
 
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity, EntityName } from '@backstage/catalog-model';
-import { Content, Header, InfoCard, Page } from '@backstage/core';
 import { createDevApp } from '@backstage/dev-utils';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Grid, ListItem, ListItemIcon, ListItemText } from '@material-ui/core';
@@ -31,6 +30,7 @@ import {
   ImportStepper,
 } from '../src';
 import { ImportComponentPage } from '../src/components/ImportComponentPage';
+import { Content, Header, InfoCard, Page } from '@backstage/core-components';
 
 const getEntityNames = (url: string): EntityName[] => [
   {

plugins/catalog-import/src/api/CatalogImportApi.ts

@@ -15,8 +15,8 @@
  */
 
 import { EntityName } from '@backstage/catalog-model';
-import { createApiRef } from '@backstage/core';
 import { PartialEntity } from '../types';
+import { createApiRef } from '@backstage/core-plugin-api';
 
 export const catalogImportApiRef = createApiRef<CatalogImportApi>({
   id: 'plugin.catalog-import.service',

plugins/catalog-import/src/api/CatalogImportClient.test.ts

@@ -51,7 +51,6 @@ jest.mock('./GitHub', () => ({
   getGithubIntegrationConfig: jest.fn(),
 }));
 
-import { ConfigReader, OAuthApi, UrlPatternDiscovery } from '@backstage/core';
 import {
   GitHubIntegrationConfig,
   ScmIntegrations,
@@ -64,6 +63,9 @@ import { setupServer } from 'msw/node';
 import { CatalogImportClient } from './CatalogImportClient';
 import { getGithubIntegrationConfig } from './GitHub';
 
+import { ConfigReader, UrlPatternDiscovery } from '@backstage/core-app-api';
+import { OAuthApi } from '@backstage/core-plugin-api';
+
 const server = setupServer();
 
 describe('CatalogImportClient', () => {

plugins/catalog-import/src/api/CatalogImportClient.ts

@@ -16,7 +16,6 @@
 
 import { CatalogApi } from '@backstage/catalog-client';
 import { EntityName } from '@backstage/catalog-model';
-import { DiscoveryApi, IdentityApi, OAuthApi } from '@backstage/core';
 import {
   GitHubIntegrationConfig,
   ScmIntegrationRegistry,
@@ -26,6 +25,11 @@ import { Octokit } from '@octokit/rest';
 import { PartialEntity } from '../types';
 import { AnalyzeResult, CatalogImportApi } from './CatalogImportApi';
 import { getGithubIntegrationConfig } from './GitHub';
+import {
+  DiscoveryApi,
+  IdentityApi,
+  OAuthApi,
+} from '@backstage/core-plugin-api';
 
 export class CatalogImportClient implements CatalogImportApi {
   private readonly discoveryApi: DiscoveryApi;

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

@@ -15,12 +15,6 @@
  */
 
 import { CatalogClient } from '@backstage/catalog-client';
-import {
-  ApiProvider,
-  ApiRegistry,
-  configApiRef,
-  ConfigReader,
-} from '@backstage/core';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { wrapInTestApp } from '@backstage/test-utils';
 import { act, render } from '@testing-library/react';
@@ -28,6 +22,13 @@ import React from 'react';
 import { catalogImportApiRef, CatalogImportClient } from '../api';
 import { ImportComponentPage } from './ImportComponentPage';
 
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
+import { configApiRef } from '@backstage/core-plugin-api';
+
 describe('<ImportComponentPage />', () => {
   const identityApi = {
     getUserId: () => {

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

@@ -14,21 +14,20 @@
  * limitations under the License.
  */
 
+import { Grid, Typography } from '@material-ui/core';
+import React from 'react';
+import { ImportStepper } from './ImportStepper';
+import { StepperProviderOpts } from './ImportStepper/defaults';
+
+import { ConfigApi, configApiRef, useApi } from '@backstage/core-plugin-api';
 import {
-  ConfigApi,
-  configApiRef,
   Content,
   ContentHeader,
   Header,
   InfoCard,
   Page,
   SupportButton,
-  useApi,
-} from '@backstage/core';
-import { Grid, Typography } from '@material-ui/core';
-import React from 'react';
-import { ImportStepper } from './ImportStepper';
-import { StepperProviderOpts } from './ImportStepper/defaults';
+} from '@backstage/core-components';
 
 function repositories(configApi: ConfigApi): string[] {
   const integrations = configApi.getConfig('integrations');

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

@@ -14,12 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  configApiRef,
-  InfoCard,
-  InfoCardVariants,
-  useApi,
-} from '@backstage/core';
 import { Step, StepContent, Stepper } from '@material-ui/core';
 import { makeStyles } from '@material-ui/core/styles';
 import React, { useMemo } from 'react';
@@ -32,6 +26,9 @@ import {
   StepperProviderOpts,
 } from './defaults';
 
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
+import { InfoCard, InfoCardVariants } from '@backstage/core-components';
+
 const useStyles = makeStyles(() => ({
   stepperRoot: {
     padding: 0,

plugins/catalog-import/src/components/ImportStepper/defaults.tsx

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { ConfigApi } from '@backstage/core';
 import {
   Box,
   Checkbox,
@@ -35,6 +34,7 @@ import {
 import { StepPrepareSelectLocations } from '../StepPrepareSelectLocations';
 import { StepReviewLocation } from '../StepReviewLocation';
 import { ImportFlows, ImportState } from '../useImportState';
+import { ConfigApi } from '@backstage/core-plugin-api';
 
 export type StepperProviderOpts = {
   pullRequest?: {

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import { Link } from '@backstage/core';
 import { Grid, Typography } from '@material-ui/core';
 import LocationOnIcon from '@material-ui/icons/LocationOn';
 import React from 'react';
 import { BackButton } from '../Buttons';
 import { EntityListComponent } from '../EntityListComponent';
 import { PrepareResult } from '../useImportState';
+import { Link } from '@backstage/core-components';
 
 type Props = {
   prepareResult: PrepareResult;

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

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
 import { act, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { AnalyzeResult, catalogImportApiRef } from '../../api/';
 import { StepInitAnalyzeUrl } from './StepInitAnalyzeUrl';
 
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import { errorApiRef } from '@backstage/core-plugin-api';
+
 describe('<StepInitAnalyzeUrl />', () => {
   const catalogImportApi: jest.Mocked<typeof catalogImportApiRef.T> = {
     analyzeUrl: jest.fn(),

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import { errorApiRef, useApi } from '@backstage/core';
 import { FormHelperText, Grid, TextField } from '@material-ui/core';
 import React, { useCallback, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { AnalyzeResult, catalogImportApiRef } from '../../api';
 import { NextButton } from '../Buttons';
 import { ImportFlows, PrepareResult } from '../useImportState';
+import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 
 type FormData = {
   url: string;

plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.tsx

@@ -15,10 +15,10 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { CodeSnippet } from '@backstage/core';
 import { Card, CardContent, CardHeader } from '@material-ui/core';
 import React from 'react';
 import YAML from 'yaml';
+import { CodeSnippet } from '@backstage/core-components';
 
 type Props = {
   repositoryUrl: string;

plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewPullRequestComponent.tsx

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { MarkdownContent } from '@backstage/core';
 import { Card, CardContent, CardHeader } from '@material-ui/core';
 import React from 'react';
+import { MarkdownContent } from '@backstage/core-components';
 
 type Props = {
   title: string;

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

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { TextField } from '@material-ui/core';
 import { act, render, screen } from '@testing-library/react';
@@ -25,6 +24,7 @@ import {
   generateEntities,
   StepPrepareCreatePullRequest,
 } from './StepPrepareCreatePullRequest';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<StepPrepareCreatePullRequest />', () => {
   const catalogImportApi: jest.Mocked<typeof catalogImportApiRef.T> = {

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { useApi } from '@backstage/core';
 import {
   catalogApiRef,
   formatEntityRefTitle,
@@ -33,6 +32,7 @@ import { PrepareResult } from '../useImportState';
 import { PreparePullRequestForm } from './PreparePullRequestForm';
 import { PreviewCatalogInfoComponent } from './PreviewCatalogInfoComponent';
 import { PreviewPullRequestComponent } from './PreviewPullRequestComponent';
+import { useApi } from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles(theme => ({
   previewCard: {

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

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { configApiRef, Link, useApi } from '@backstage/core';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { FormHelperText, Grid, Typography } from '@material-ui/core';
 import LocationOnIcon from '@material-ui/icons/LocationOn';
@@ -23,6 +22,9 @@ import { BackButton, NextButton } from '../Buttons';
 import { EntityListComponent } from '../EntityListComponent';
 import { PrepareResult, ReviewResult } from '../useImportState';
 
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
+import { Link } from '@backstage/core-components';
+
 type Props = {
   prepareResult: PrepareResult;
   onReview: (result: ReviewResult) => void;

plugins/catalog-import/src/plugin.ts

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+import { scmIntegrationsApiRef } from '@backstage/integration-react';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
+import { catalogImportApiRef, CatalogImportClient } from './api';
 import {
   createApiFactory,
   createPlugin,
@@ -22,10 +25,7 @@ import {
   discoveryApiRef,
   githubAuthApiRef,
   identityApiRef,
-} from '@backstage/core';
-import { scmIntegrationsApiRef } from '@backstage/integration-react';
-import { catalogApiRef } from '@backstage/plugin-catalog-react';
-import { catalogImportApiRef, CatalogImportClient } from './api';
+} from '@backstage/core-plugin-api';
 
 export const rootRouteRef = createRouteRef({
   path: '',

plugins/catalog-react/src/components/EntityRefLink/EntityRefLink.tsx

@@ -18,11 +18,11 @@ import {
   EntityName,
   ENTITY_DEFAULT_NAMESPACE,
 } from '@backstage/catalog-model';
-import { Link, LinkProps } from '@backstage/core';
 import React, { forwardRef } from 'react';
 import { generatePath } from 'react-router';
 import { entityRoute } from '../../routes';
 import { formatEntityRefTitle } from './format';
+import { Link, LinkProps } from '@backstage/core-components';
 
 export type EntityRefLinkProps = {
   entityRef: Entity | EntityName;

plugins/catalog-react/src/components/EntityRefLink/EntityRefLinks.tsx

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 import { Entity, EntityName } from '@backstage/catalog-model';
-import { LinkProps } from '@backstage/core';
 import React from 'react';
 import { EntityRefLink } from './EntityRefLink';
+import { LinkProps } from '@backstage/core-components';
 
 export type EntityRefLinksProps = {
   entityRefs: (Entity | EntityName)[];

plugins/catalog-react/src/components/EntityTable/EntityTable.tsx

@@ -15,11 +15,11 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { Table, TableColumn } from '@backstage/core';
 import { makeStyles } from '@material-ui/core';
 import React, { ReactNode } from 'react';
 import * as columnFactories from './columns';
 import { componentEntityColumns, systemEntityColumns } from './presets';
+import { Table, TableColumn } from '@backstage/core-components';
 
 type Props<T extends Entity> = {
   title: string;

plugins/catalog-react/src/components/EntityTable/columns.tsx

@@ -20,7 +20,6 @@ import {
   RELATION_OWNED_BY,
   RELATION_PART_OF,
 } from '@backstage/catalog-model';
-import { OverflowTooltip, TableColumn } from '@backstage/core';
 import React from 'react';
 import { getEntityRelations } from '../../utils';
 import {
@@ -28,6 +27,7 @@ import {
   EntityRefLinks,
   formatEntityRefTitle,
 } from '../EntityRefLink';
+import { OverflowTooltip, TableColumn } from '@backstage/core-components';
 
 export function createEntityRefColumn<T extends Entity>({
   defaultKind,

plugins/catalog-react/src/components/EntityTable/presets.tsx

@@ -15,7 +15,6 @@
  */
 
 import { ComponentEntity, SystemEntity } from '@backstage/catalog-model';
-import { TableColumn } from '@backstage/core';
 import {
   createDomainColumn,
   createEntityRefColumn,
@@ -25,6 +24,7 @@ import {
   createSpecTypeColumn,
   createSystemColumn,
 } from './columns';
+import { TableColumn } from '@backstage/core-components';
 
 export const systemEntityColumns: TableColumn<SystemEntity>[] = [
   createEntityRefColumn({ defaultKind: 'system' }),

plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.test.tsx

@@ -17,12 +17,6 @@
 import React from 'react';
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import { capitalize } from 'lodash';
-import {
-  AlertApi,
-  alertApiRef,
-  ApiProvider,
-  ApiRegistry,
-} from '@backstage/core';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
 import { EntityTypePicker } from './EntityTypePicker';
@@ -30,6 +24,9 @@ import { MockEntityListContextProvider } from '../../testUtils/providers';
 import { catalogApiRef } from '../../api';
 import { EntityKindFilter, EntityTypeFilter } from '../../types';
 
+import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+
 const entities: Entity[] = [
   {
     apiVersion: '1',

plugins/catalog-react/src/components/EntityTypePicker/EntityTypePicker.tsx

@@ -17,9 +17,11 @@
 import React from 'react';
 import { capitalize } from 'lodash';
 import { Box } from '@material-ui/core';
-import { alertApiRef, Select, useApi } from '@backstage/core';
 import { useEntityTypeFilter } from '../../hooks/useEntityTypeFilter';
 
+import { alertApiRef, useApi } from '@backstage/core-plugin-api';
+import { Select } from '@backstage/core-components';
+
 export const EntityTypePicker = () => {
   const alertApi = useApi(alertApiRef);
   const { error, types, selectedType, setType } = useEntityTypeFilter();

plugins/catalog-react/src/components/UserListPicker/UserListPicker.test.tsx

@@ -23,19 +23,19 @@ import {
 } from '@backstage/catalog-model';
 import { UserListPicker } from './UserListPicker';
 import { MockEntityListContextProvider } from '../../testUtils/providers';
+import { EntityTagFilter, UserListFilter } from '../../types';
+import { CatalogApi } from '@backstage/catalog-client';
+import { catalogApiRef } from '../../api';
+import { MockStorageApi } from '@backstage/test-utils';
+
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 import {
-  ApiProvider,
-  ApiRegistry,
   ConfigApi,
   configApiRef,
   IdentityApi,
   identityApiRef,
   storageApiRef,
-} from '@backstage/core';
-import { EntityTagFilter, UserListFilter } from '../../types';
-import { CatalogApi } from '@backstage/catalog-client';
-import { catalogApiRef } from '../../api';
-import { MockStorageApi } from '@backstage/test-utils';
+} from '@backstage/core-plugin-api';
 
 const mockUser: UserEntity = {
   apiVersion: 'backstage.io/v1alpha1',

plugins/catalog-react/src/components/UserListPicker/UserListPicker.tsx

@@ -16,7 +16,6 @@
 
 import React, { Fragment, useEffect, useMemo, useState } from 'react';
 import { compact } from 'lodash';
-import { configApiRef, IconComponent, useApi } from '@backstage/core';
 import { UserListFilter, UserListFilterKind } from '../../types';
 import {
   useEntityListProvider,
@@ -37,6 +36,11 @@ import {
 import SettingsIcon from '@material-ui/icons/Settings';
 import StarIcon from '@material-ui/icons/Star';
 import { reduceEntityFilters } from '../../utils';
+import {
+  configApiRef,
+  IconComponent,
+  useApi,
+} from '@backstage/core-plugin-api';
 
 const useStyles = makeStyles<Theme>(theme => ({
   root: {

plugins/catalog-react/src/hooks/useEntityCompoundName.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useRouteRefParams } from '@backstage/core';
 import { entityRouteRef } from '../routes';
+import { useRouteRefParams } from '@backstage/core-plugin-api';
 
 /**
  * Grabs entity kind, namespace, and name from the location

plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx

@@ -16,15 +16,6 @@
 
 import React, { PropsWithChildren } from 'react';
 import { act, renderHook } from '@testing-library/react-hooks';
-import {
-  ApiProvider,
-  ApiRegistry,
-  ConfigApi,
-  configApiRef,
-  IdentityApi,
-  identityApiRef,
-  storageApiRef,
-} from '@backstage/core';
 import { MockStorageApi } from '@backstage/test-utils';
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity, UserEntity } from '@backstage/catalog-model';
@@ -41,6 +32,15 @@ import {
 } from '../types';
 import { EntityKindPicker, UserListPicker } from '../components';
 
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import {
+  ConfigApi,
+  configApiRef,
+  IdentityApi,
+  identityApiRef,
+  storageApiRef,
+} from '@backstage/core-plugin-api';
+
 const mockUser: UserEntity = {
   apiVersion: 'backstage.io/v1beta1',
   kind: 'User',

plugins/catalog-react/src/hooks/useEntityListProvider.tsx

@@ -15,7 +15,6 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { useApi } from '@backstage/core';
 import { compact, isEqual } from 'lodash';
 import React, {
   createContext,
@@ -36,6 +35,7 @@ import {
   UserListFilter,
 } from '../types';
 import { reduceCatalogFilters, reduceEntityFilters } from '../utils';
+import { useApi } from '@backstage/core-plugin-api';
 
 export type DefaultEntityFilters = {
   kind?: EntityKindFilter;

plugins/catalog-react/src/hooks/useEntityTypeFilter.tsx

@@ -16,13 +16,13 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useAsync } from 'react-use';
-import { useApi } from '@backstage/core';
 import { catalogApiRef } from '../api';
 import {
   DefaultEntityFilters,
   useEntityListProvider,
 } from './useEntityListProvider';
 import { EntityTypeFilter } from '../types';
+import { useApi } from '@backstage/core-plugin-api';
 
 type EntityTypeReturn = {
   loading: boolean;

plugins/catalog-react/src/hooks/useOwnUser.ts

@@ -15,10 +15,10 @@
  */
 
 import { UserEntity } from '@backstage/catalog-model';
-import { identityApiRef, useApi } from '@backstage/core';
 import { useAsync } from 'react-use';
 import { AsyncState } from 'react-use/lib/useAsync';
 import { catalogApiRef } from '../api';
+import { identityApiRef, useApi } from '@backstage/core-plugin-api';
 
 /**
  * Get the catalog User entity (if any) that matches the logged-in user.

plugins/catalog-react/src/hooks/useStarredEntities.test.tsx

@@ -17,10 +17,10 @@
 import React, { PropsWithChildren } from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useStarredEntities } from './useStarredEntities';
-import { ApiProvider, ApiRegistry, WebStorage } from '@backstage/core';
 import { storageApiRef, StorageApi } from '@backstage/core-plugin-api';
 import { MockErrorApi } from '@backstage/test-utils';
 import { Entity } from '@backstage/catalog-model';
+import { ApiProvider, ApiRegistry, WebStorage } from '@backstage/core-app-api';
 
 describe('useStarredEntities', () => {
   let mockStorage: StorageApi | undefined;

plugins/catalog-react/src/routes.ts

@@ -15,7 +15,7 @@
  */
 
 import { Entity, ENTITY_DEFAULT_NAMESPACE } from '@backstage/catalog-model';
-import { createRouteRef } from '@backstage/core';
+import { createRouteRef } from '@backstage/core-plugin-api';
 
 const NoIcon = () => null;
 

plugins/catalog/src/CatalogClientWrapper.test.ts

@@ -15,8 +15,8 @@
  */
 
 import { CatalogClient } from '@backstage/catalog-client';
-import { DiscoveryApi, IdentityApi } from '@backstage/core';
 import { CatalogClientWrapper } from './CatalogClientWrapper';
+import { DiscoveryApi, IdentityApi } from '@backstage/core-plugin-api';
 
 jest.mock('@backstage/catalog-client');
 const MockedCatalogClient = CatalogClient as jest.Mock<CatalogClient>;

plugins/catalog/src/CatalogClientWrapper.ts

@@ -23,7 +23,7 @@ import {
   CatalogListResponse,
   CatalogClient,
 } from '@backstage/catalog-client';
-import { IdentityApi } from '@backstage/core';
+import { IdentityApi } from '@backstage/core-plugin-api';
 
 type CatalogRequestOptions = {
   token?: string;

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

@@ -15,7 +15,6 @@
  */
 
 import { RELATION_OWNED_BY } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry, ConfigReader } from '@backstage/core';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
@@ -25,6 +24,11 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { act, fireEvent } from '@testing-library/react';
 import React from 'react';
 import { AboutCard } from './AboutCard';
+import {
+  ApiProvider,
+  ApiRegistry,
+  ConfigReader,
+} from '@backstage/core-app-api';
 
 describe('<AboutCard />', () => {
   it('renders info', async () => {

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

@@ -20,12 +20,6 @@ import {
   RELATION_CONSUMES_API,
   RELATION_PROVIDES_API,
 } from '@backstage/catalog-model';
-import {
-  HeaderIconLinkRow,
-  IconLinkVerticalProps,
-  InfoCardVariants,
-  useApi,
-} from '@backstage/core';
 import {
   ScmIntegrationIcon,
   scmIntegrationsApiRef,
@@ -50,6 +44,13 @@ import ExtensionIcon from '@material-ui/icons/Extension';
 import React from 'react';
 import { AboutContent } from './AboutContent';
 
+import {
+  HeaderIconLinkRow,
+  IconLinkVerticalProps,
+  InfoCardVariants,
+} from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+
 const useStyles = makeStyles({
   gridItemCard: {
     display: 'flex',

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

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-import { configApiRef, Header, Page, useApi } from '@backstage/core';
 import React from 'react';
 
+import { configApiRef, useApi } from '@backstage/core-plugin-api';
+import { Header, Page } from '@backstage/core-components';
+
 type Props = {
   children?: React.ReactNode;
 };

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

@@ -20,14 +20,6 @@ import {
   RELATION_MEMBER_OF,
   RELATION_OWNED_BY,
 } from '@backstage/catalog-model';
-import {
-  ApiProvider,
-  ApiRegistry,
-  IdentityApi,
-  identityApiRef,
-  ProfileInfo,
-  storageApiRef,
-} from '@backstage/core';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import {
   MockStorageApi,
@@ -39,6 +31,14 @@ import React from 'react';
 import { createComponentRouteRef } from '../../routes';
 import { CatalogPage } from './CatalogPage';
 
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+import {
+  IdentityApi,
+  identityApiRef,
+  ProfileInfo,
+  storageApiRef,
+} from '@backstage/core-plugin-api';
+
 describe('CatalogPage', () => {
   const catalogApi: Partial<CatalogApi> = {
     getEntities: () =>

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

@@ -16,12 +16,6 @@
 
 import React from 'react';
 import { makeStyles } from '@material-ui/core';
-import {
-  Content,
-  ContentHeader,
-  SupportButton,
-  TableColumn,
-} from '@backstage/core';
 import {
   EntityKindPicker,
   EntityLifecyclePicker,
@@ -32,11 +26,17 @@ import {
   UserListFilterKind,
   UserListPicker,
 } from '@backstage/plugin-catalog-react';
-
 import { CatalogTable } from '../CatalogTable';
+
 import { EntityRow } from '../CatalogTable/types';
 import CatalogLayout from './CatalogLayout';
 import { CreateComponentButton } from '../CreateComponentButton';
+import {
+  Content,
+  ContentHeader,
+  SupportButton,
+  TableColumn,
+} from '@backstage/core-components';
 
 const useStyles = makeStyles(theme => ({
   contentWrapper: {

plugins/catalog/src/components/CatalogResultListItem/CatalogResultListItem.tsx

@@ -15,7 +15,6 @@
  */
 
 import React from 'react';
-import { Link } from '@backstage/core';
 import {
   Box,
   Chip,
@@ -24,6 +23,7 @@ import {
   ListItemText,
   makeStyles,
 } from '@material-ui/core';
+import { Link } from '@backstage/core-components';
 
 const useStyles = makeStyles({
   flexContainer: {

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

@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 import { RELATION_OWNED_BY, RELATION_PART_OF } from '@backstage/catalog-model';
-import {
-  CodeSnippet,
-  Table,
-  TableColumn,
-  TableProps,
-  WarningPanel,
-} from '@backstage/core';
 import {
   formatEntityRefTitle,
   getEntityMetadataEditUrl,
@@ -39,6 +32,13 @@ import {
 } from '../FavouriteEntity/FavouriteEntity';
 import * as columnFactories from './columns';
 import { EntityRow } from './types';
+import {
+  CodeSnippet,
+  Table,
+  TableColumn,
+  TableProps,
+  WarningPanel,
+} from '@backstage/core-components';
 
 const defaultColumns: TableColumn<EntityRow>[] = [
   columnFactories.createNameColumn(),

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

@@ -15,9 +15,9 @@
  */
 import React from 'react';
 import { EntityRefLink, EntityRefLinks } from '@backstage/plugin-catalog-react';
-import { OverflowTooltip, TableColumn } from '@backstage/core';
 import { Chip } from '@material-ui/core';
 import { EntityRow } from './types';
+import { OverflowTooltip, TableColumn } from '@backstage/core-components';
 
 export function createNameColumn(): TableColumn<EntityRow> {
   return {

plugins/catalog/src/components/CreateComponentButton/CreateComponentButton.tsx

@@ -17,8 +17,8 @@
 import React from 'react';
 import { Link as RouterLink } from 'react-router-dom';
 import { Button } from '@material-ui/core';
-import { useRouteRef } from '@backstage/core';
 import { createComponentRouteRef } from '../../routes';
+import { useRouteRef } from '@backstage/core-plugin-api';
 
 export const CreateComponentButton = () => {
   const createComponentLink = useRouteRef(createComponentRouteRef);

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_DEPENDENCY_OF } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -25,6 +24,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { DependencyOfComponentsCard } from './DependencyOfComponentsCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<DependencyOfComponentsCard />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_DEPENDS_ON } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -25,6 +24,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { DependsOnComponentsCard } from './DependsOnComponentsCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<DependsOnComponentsCard />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {

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

@@ -15,7 +15,6 @@
  */
 
 import { Entity, RELATION_DEPENDS_ON } from '@backstage/catalog-model';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import {
   CatalogApi,
   catalogApiRef,
@@ -25,6 +24,7 @@ import { renderInTestApp } from '@backstage/test-utils';
 import { waitFor } from '@testing-library/react';
 import React from 'react';
 import { DependsOnResourcesCard } from './DependsOnResourcesCard';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<DependsOnResourcesCard />', () => {
   const catalogApi: jest.Mocked<CatalogApi> = {

plugins/catalog/src/components/EntityContextMenu/EntityContextMenu.tsx

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { IconComponent } from '@backstage/core';
 import {
   Divider,
   IconButton,
@@ -28,6 +27,7 @@ import { makeStyles } from '@material-ui/core/styles';
 import Cancel from '@material-ui/icons/Cancel';
 import MoreVert from '@material-ui/icons/MoreVert';
 import React, { useState } from 'react';
+import { IconComponent } from '@backstage/core-plugin-api';
 
 // TODO(freben): It should probably instead be the case that Header sets the theme text color to white inside itself unconditionally instead
 const useStyles = makeStyles({

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

@@ -15,12 +15,6 @@
  */
 import { CatalogApi } from '@backstage/catalog-client';
 import { Entity } from '@backstage/catalog-model';
-import {
-  AlertApi,
-  alertApiRef,
-  ApiProvider,
-  ApiRegistry,
-} from '@backstage/core';
 import { catalogApiRef, EntityContext } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { fireEvent } from '@testing-library/react';
@@ -29,6 +23,9 @@ import { act } from 'react-dom/test-utils';
 import { Route, Routes } from 'react-router';
 import { EntityLayout } from './EntityLayout';
 
+import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+
 const mockEntityData = {
   loading: false,
   error: undefined,

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

@@ -20,16 +20,10 @@ import {
   RELATION_OWNED_BY,
 } from '@backstage/catalog-model';
 import {
+  useElementFilter,
   attachComponentData,
-  Content,
-  Header,
-  HeaderLabel,
   IconComponent,
-  Page,
-  Progress,
-  RoutedTabs,
-} from '@backstage/core';
-import { useElementFilter } from '@backstage/core-plugin-api';
+} from '@backstage/core-plugin-api';
 import {
   EntityContext,
   EntityRefLinks,
@@ -43,6 +37,14 @@ import { useNavigate } from 'react-router';
 import { EntityContextMenu } from '../EntityContextMenu/EntityContextMenu';
 import { FavouriteEntity } from '../FavouriteEntity/FavouriteEntity';
 import { UnregisterEntityDialog } from '../UnregisterEntityDialog/UnregisterEntityDialog';
+import {
+  Content,
+  Header,
+  HeaderLabel,
+  Page,
+  Progress,
+  RoutedTabs,
+} from '@backstage/core-components';
 
 type SubRoute = {
   path: string;

plugins/catalog/src/components/EntityLinksCard/EntityLinksEmptyState.tsx

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { CodeSnippet } from '@backstage/core';
 import { BackstageTheme } from '@backstage/theme';
 import { Button, makeStyles, Typography } from '@material-ui/core';
 import React from 'react';
+import { CodeSnippet } from '@backstage/core-components';
 
 const ENTITY_YAML = `metadata:
   name: example

plugins/catalog/src/components/EntityLinksCard/IconLink.tsx

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import { Link, IconComponent } from '@backstage/core';
 import { Grid, makeStyles, Typography } from '@material-ui/core';
 import LanguageIcon from '@material-ui/icons/Language';
 import React from 'react';
 
+import { Link } from '@backstage/core-components';
+import { IconComponent } from '@backstage/core-plugin-api';
+
 const useStyles = makeStyles({
   svgIcon: {
     display: 'inline-block',

plugins/catalog/src/components/EntityLinksCard/LinksGridList.tsx

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import { IconComponent } from '@backstage/core';
 import { GridList, GridListTile } from '@material-ui/core';
 import React from 'react';
 import { IconLink } from './IconLink';
 import { ColumnBreakpoints } from './types';
 import { useDynamicColumns } from './useDynamicColumns';
+import { IconComponent } from '@backstage/core-plugin-api';
 
 export type LinksGridListItem = {
   href: string;

plugins/catalog/src/components/EntityOrphanWarning/DeleteEntityDialog.test.tsx

@@ -17,17 +17,14 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { DeleteEntityDialog } from './DeleteEntityDialog';
 import { ORIGIN_LOCATION_ANNOTATION } from '@backstage/catalog-model';
-import {
-  AlertApi,
-  alertApiRef,
-  ApiProvider,
-  ApiRegistry,
-} from '@backstage/core';
 import { CatalogApi } from '@backstage/catalog-client';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { screen, waitFor } from '@testing-library/react';
 import { renderInTestApp } from '@backstage/test-utils';
 
+import { AlertApi, alertApiRef } from '@backstage/core-plugin-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
+
 describe('DeleteEntityDialog', () => {
   const alertApi: jest.Mocked<AlertApi> = {
     post: jest.fn(),

plugins/catalog/src/components/EntityOrphanWarning/DeleteEntityDialog.tsx

@@ -15,10 +15,10 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { alertApiRef, useApi } from '@backstage/core';
 import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { Button, Dialog, DialogActions, DialogTitle } from '@material-ui/core';
 import React, { useState } from 'react';
+import { alertApiRef, useApi } from '@backstage/core-plugin-api';
 
 type Props = {
   open: boolean;

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

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-import { ApiProvider, ApiRegistry } from '@backstage/core';
-
 import {
   CatalogApi,
   catalogApiRef,
   catalogRouteRef,
   EntityProvider,
 } from '@backstage/plugin-catalog-react';
+
 import { renderInTestApp } from '@backstage/test-utils';
 import React from 'react';
 import { EntityOrphanWarning } from './EntityOrphanWarning';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('<EntityOrphanWarning />', () => {
   const catalogClient: jest.Mocked<CatalogApi> = {

plugins/catalog/src/components/EntityOrphanWarning/EntityOrphanWarning.tsx

@@ -15,12 +15,12 @@
  */
 
 import { Entity } from '@backstage/catalog-model';
-import { useRouteRef } from '@backstage/core';
 import { catalogRouteRef, useEntity } from '@backstage/plugin-catalog-react';
 import { Alert } from '@material-ui/lab';
 import React, { useState } from 'react';
 import { useNavigate } from 'react-router';
 import { DeleteEntityDialog } from './DeleteEntityDialog';
+import { useRouteRef } from '@backstage/core-plugin-api';
 
 export const isOrphan = (entity: Entity) =>
   entity?.metadata?.annotations?.['backstage.io/orphan'] === 'true';

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

@@ -18,17 +18,6 @@ import {
   ENTITY_DEFAULT_NAMESPACE,
   RELATION_OWNED_BY,
 } from '@backstage/catalog-model';
-import {
-  Content,
-  Header,
-  HeaderLabel,
-  IconComponent,
-  Link,
-  Page,
-  Progress,
-  ResponseErrorPanel,
-  WarningPanel,
-} from '@backstage/core';
 import {
   EntityContext,
   EntityRefLinks,
@@ -43,6 +32,19 @@ import { FavouriteEntity } from '../FavouriteEntity/FavouriteEntity';
 import { UnregisterEntityDialog } from '../UnregisterEntityDialog/UnregisterEntityDialog';
 import { Tabbed } from './Tabbed';
 
+import {
+  Content,
+  Header,
+  HeaderLabel,
+  Link,
+  Page,
+  Progress,
+  ResponseErrorPanel,
+  WarningPanel,
+} from '@backstage/core-components';
+
+import { IconComponent } from '@backstage/core-plugin-api';
+
 const EntityPageTitle = ({
   entity,
   title,