apply core-imports codemod to all packages and plugins

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

packages/app/src/apis.ts

@@ -14,13 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  AnyApiFactory,
-  configApiRef,
-  createApiFactory,
-  errorApiRef,
-  githubAuthApiRef,
-} from '@backstage/core';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
@@ -33,6 +26,13 @@ import {
   graphQlBrowseApiRef,
   GraphQLEndpoints,
 } from '@backstage/plugin-graphiql';
+import {
+  AnyApiFactory,
+  configApiRef,
+  createApiFactory,
+  errorApiRef,
+  githubAuthApiRef,
+} from '@backstage/core-plugin-api';
 
 export const apis: AnyApiFactory[] = [
   createApiFactory({

packages/app/src/components/Root/Root.tsx

@@ -26,6 +26,11 @@ import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
 import MoneyIcon from '@material-ui/icons/MonetizationOn';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
+import { NavLink } from 'react-router-dom';
+import { GraphiQLIcon } from '@backstage/plugin-graphiql';
+import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
+import { SidebarSearch } from '@backstage/plugin-search';
+import { Shortcuts } from '@backstage/plugin-shortcuts';
 import {
   Sidebar,
   SidebarPage,
@@ -34,12 +39,7 @@ import {
   SidebarItem,
   SidebarDivider,
   SidebarSpace,
-} from '@backstage/core';
-import { NavLink } from 'react-router-dom';
-import { GraphiQLIcon } from '@backstage/plugin-graphiql';
-import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
-import { SidebarSearch } from '@backstage/plugin-search';
-import { Shortcuts } from '@backstage/plugin-shortcuts';
+} from '@backstage/core-components';
 
 const useSidebarLogoStyles = makeStyles({
   root: {

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

@@ -15,12 +15,12 @@
  */
 
 import React from 'react';
-import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { EntityLayout } from '@backstage/plugin-catalog';
 import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { renderInTestApp } from '@backstage/test-utils';
 import { cicdContent } from './EntityPage';
 import { githubActionsApiRef } from '@backstage/plugin-github-actions';
+import { ApiProvider, ApiRegistry } from '@backstage/core-app-api';
 
 describe('EntityPage Test', () => {
   const entity = {

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

@@ -16,7 +16,6 @@
 
 import React, { ReactNode, useMemo, useState } from 'react';
 import BadgeIcon from '@material-ui/icons/CallToAction';
-import { EmptyState } from '@backstage/core';
 import {
   EntityApiDefinitionCard,
   EntityConsumingComponentsCard,
@@ -108,6 +107,7 @@ import {
   isTravisciAvailable,
 } from '@roadiehq/backstage-plugin-travis-ci';
 import { EntityCodeCoverageContent } from '@backstage/plugin-code-coverage';
+import { EmptyState } from '@backstage/core-components';
 
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);

packages/app/src/components/search/SearchPage.tsx

@@ -17,7 +17,6 @@
 import React from 'react';
 import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
 
-import { Content, Header, Lifecycle, Page } from '@backstage/core';
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
 import {
   SearchBar,
@@ -25,6 +24,7 @@ import {
   SearchResult,
   DefaultResultListItem,
 } from '@backstage/plugin-search';
+import { Content, Header, Lifecycle, Page } from '@backstage/core-components';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {

packages/app/src/identityProviders.ts

@@ -24,7 +24,7 @@ import {
   oneloginAuthApiRef,
   oauth2ApiRef,
   oidcAuthApiRef,
-} from '@backstage/core';
+} from '@backstage/core-plugin-api';
 
 export const providers = [
   {

packages/create-app/templates/default-app/packages/app/src/App.tsx

@@ -1,11 +1,5 @@
 import React from 'react';
 import { Navigate, Route } from 'react-router';
-import {
-  AlertDisplay,
-  createApp,
-  FlatRoutes,
-  OAuthRequestDialog,
-} from '@backstage/core';
 import { apiDocsPlugin, ApiExplorerPage } from '@backstage/plugin-api-docs';
 import {
   CatalogEntityPage,
@@ -25,6 +19,9 @@ import { apis } from './apis';
 import { entityPage } from './components/catalog/EntityPage';
 import { Root } from './components/Root';
 
+import { AlertDisplay, OAuthRequestDialog } from '@backstage/core-components';
+import { createApp, FlatRoutes } from '@backstage/core-app-api';
+
 const app = createApp({
   apis,
   bindRoutes({ bind }) {

packages/create-app/templates/default-app/packages/app/src/apis.ts

@@ -1,9 +1,7 @@
-import {
-  AnyApiFactory, configApiRef, createApiFactory
-} from '@backstage/core';
 import {
   ScmIntegrationsApi, scmIntegrationsApiRef
 } from '@backstage/integration-react';
+import { AnyApiFactory, configApiRef, createApiFactory } from '@backstage/core-plugin-api';
 
 export const apis: AnyApiFactory[] = [
   createApiFactory({

packages/create-app/templates/default-app/packages/app/src/components/Root/Root.tsx

@@ -23,6 +23,9 @@ import LibraryBooks from '@material-ui/icons/LibraryBooks';
 import CreateComponentIcon from '@material-ui/icons/AddCircleOutline';
 import LogoFull from './LogoFull';
 import LogoIcon from './LogoIcon';
+import { NavLink } from 'react-router-dom';
+import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
+import { SidebarSearch } from '@backstage/plugin-search';
 import {
   Sidebar,
   SidebarPage,
@@ -31,10 +34,7 @@ import {
   SidebarItem,
   SidebarDivider,
   SidebarSpace,
-} from '@backstage/core';
-import { NavLink } from 'react-router-dom';
-import { Settings as SidebarSettings } from '@backstage/plugin-user-settings';
-import { SidebarSearch } from '@backstage/plugin-search';
+} from '@backstage/core-components';
 
 const useSidebarLogoStyles = makeStyles({
   root: {

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

@@ -15,7 +15,6 @@
  */
 import React from 'react';
 import { Button, Grid } from '@material-ui/core';
-import { EmptyState } from '@backstage/core';
 import {
   EntityApiDefinitionCard,
   EntityConsumedApisCard,
@@ -50,6 +49,7 @@ import {
   EntityOwnershipCard,
 } from '@backstage/plugin-org';
 import { EntityTechdocsContent } from '@backstage/plugin-techdocs';
+import { EmptyState } from '@backstage/core-components';
 
 const cicdContent = (
   // This is an example of how you can implement your company's logic in entity page.

packages/create-app/templates/default-app/packages/app/src/components/search/SearchPage.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { makeStyles, Theme, Grid, List, Paper } from '@material-ui/core';
 
-import { Content, Header, Page } from '@backstage/core';
 import { CatalogResultListItem } from '@backstage/plugin-catalog';
 import {
   SearchBar,
@@ -9,6 +8,7 @@ import {
   SearchResult,
   DefaultResultListItem,
 } from '@backstage/plugin-search';
+import { Content, Header, Page } from '@backstage/core-components';
 
 const useStyles = makeStyles((theme: Theme) => ({
   bar: {

packages/dev-utils/src/devApp/render.test.tsx

@@ -16,8 +16,8 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import { useApi, configApiRef } from '@backstage/core';
 import { createDevApp } from './render';
+import { useApi, configApiRef } from '@backstage/core-plugin-api';
 
 const anyEnv = (process.env = { ...process.env }) as any;
 

packages/dev-utils/src/devApp/render.tsx

@@ -14,25 +14,6 @@
  * limitations under the License.
  */
 
-import {
-  AlertDisplay,
-  AnyApiFactory,
-  ApiFactory,
-  attachComponentData,
-  configApiRef,
-  createApiFactory,
-  createApp,
-  createPlugin,
-  createRouteRef,
-  FlatRoutes,
-  IconComponent,
-  OAuthRequestDialog,
-  RouteRef,
-  Sidebar,
-  SidebarItem,
-  SidebarPage,
-  SidebarSpacer,
-} from '@backstage/core';
 import {
   ScmIntegrationsApi,
   scmIntegrationsApiRef,
@@ -44,6 +25,29 @@ import ReactDOM from 'react-dom';
 import { hot } from 'react-hot-loader';
 import { Route } from 'react-router';
 
+import {
+  AlertDisplay,
+  OAuthRequestDialog,
+  Sidebar,
+  SidebarItem,
+  SidebarPage,
+  SidebarSpacer,
+} from '@backstage/core-components';
+
+import {
+  AnyApiFactory,
+  ApiFactory,
+  attachComponentData,
+  configApiRef,
+  createApiFactory,
+  createPlugin,
+  createRouteRef,
+  IconComponent,
+  RouteRef,
+} from '@backstage/core-plugin-api';
+
+import { createApp, FlatRoutes } from '@backstage/core-app-api';
+
 const GatheringRoute: (props: {
   path: string;
   element: JSX.Element;

packages/integration-react/dev/DevPage.tsx

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-import { Content, useApi } from '@backstage/core';
 import { ScmIntegration, ScmIntegrationsGroup } from '@backstage/integration';
 import { Typography } from '@material-ui/core';
 import React from 'react';
 import { scmIntegrationsApiRef } from '../src/ScmIntegrationsApi';
 
+import { Content } from '@backstage/core-components';
+import { useApi } from '@backstage/core-plugin-api';
+
 const Integrations = (props: {
   group: ScmIntegrationsGroup<ScmIntegration>;
 }) => {

packages/integration-react/dev/index.tsx

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { configApiRef, createApiFactory } from '@backstage/core';
 import { createDevApp } from '@backstage/dev-utils';
 import { ScmIntegrations } from '@backstage/integration';
 import React from 'react';
 import { scmIntegrationsApiRef } from '../src/ScmIntegrationsApi';
 import { DevPage } from './DevPage';
+import { configApiRef, createApiFactory } from '@backstage/core-plugin-api';
 
 createDevApp()
   .registerApi(

packages/integration-react/src/api/ScmIntegrationsApi.ts

@@ -15,11 +15,11 @@
  */
 
 import { Config } from '@backstage/config';
-import { ApiRef, createApiRef } from '@backstage/core';
 import {
   ScmIntegrationRegistry,
   ScmIntegrations,
 } from '@backstage/integration';
+import { ApiRef, createApiRef } from '@backstage/core-plugin-api';
 
 export class ScmIntegrationsApi {
   static fromConfig(config: Config): ScmIntegrationRegistry {

packages/integration-react/src/components/ScmIntegrationIcon/ScmIntegrationIcon.tsx

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useApp } from '@backstage/core';
 import CodeIcon from '@material-ui/icons/Code';
 import React from 'react';
+import { useApp } from '@backstage/core-plugin-api';
 
 export const ScmIntegrationIcon = ({ type }: { type?: string }) => {
   const app = useApp();

packages/storybook/.storybook/apis.js

@@ -1,28 +1,31 @@
 import {
   AlertApiForwarder,
-  alertApiRef,
   ApiRegistry,
   ErrorAlerter,
   ErrorApiForwarder,
-  errorApiRef,
   GithubAuth,
-  githubAuthApiRef,
   GitlabAuth,
-  gitlabAuthApiRef,
   GoogleAuth,
-  googleAuthApiRef,
-  identityApiRef,
   OAuth2,
-  oauth2ApiRef,
-  oauthRequestApiRef,
   OAuthRequestManager,
   OktaAuth,
-  oktaAuthApiRef,
   Auth0Auth,
+  ConfigReader,
+} from '@backstage/core-app-api';
+
+import {
+  alertApiRef,
+  errorApiRef,
+  githubAuthApiRef,
+  gitlabAuthApiRef,
+  googleAuthApiRef,
+  identityApiRef,
+  oauth2ApiRef,
+  oauthRequestApiRef,
+  oktaAuthApiRef,
   auth0AuthApiRef,
   configApiRef,
-  ConfigReader,
-} from '@backstage/core';
+} from '@backstage/core-plugin-api';
 
 const builder = ApiRegistry.builder();
 

packages/storybook/.storybook/preview.js

@@ -3,9 +3,11 @@ import { addDecorator, addParameters } from '@storybook/react';
 import { lightTheme, darkTheme } from '@backstage/theme';
 import { CssBaseline, ThemeProvider } from '@material-ui/core';
 import { useDarkMode } from 'storybook-dark-mode';
-import { Content, ApiProvider, AlertDisplay } from '@backstage/core';
 import { apis } from './apis';
 
+import { Content, AlertDisplay } from '@backstage/core-components';
+import { ApiProvider } from '@backstage/core-app-api';
+
 addDecorator(story => (
   <ApiProvider apis={apis}>
     <ThemeProvider theme={useDarkMode() ? darkTheme : lightTheme}>