Move EntityProvider to plugin-catalog-react

packages/dev-utils/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@backstage/core": "^0.5.0",
     "@backstage/catalog-model": "^0.7.0",
-    "@backstage/plugin-catalog": "^0.2.14",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/test-utils": "^0.1.5",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",

packages/dev-utils/src/components/EntityGridItem/EntityGridItem.tsx

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import React from 'react';
-import { Grid, GridProps, makeStyles } from '@material-ui/core';
 import { Entity } from '@backstage/catalog-model';
-import { EntityProvider } from '@backstage/plugin-catalog';
+import { EntityProvider } from '@backstage/plugin-catalog-react';
 import { BackstageTheme } from '@backstage/theme';
+import { Grid, GridProps, makeStyles } from '@material-ui/core';
+import React from 'react';
 
 const useStyles = makeStyles<BackstageTheme, { entity: Entity }>(theme => ({
   root: ({ entity }) => ({

plugins/catalog-react/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-react';
+import { EntityContext } from '../../hooks';
 
 type EntityProviderProps = {
   entity: Entity;

plugins/catalog-react/src/components/index.ts

@@ -14,3 +14,4 @@
  * limitations under the License.
  */
 export * from './EntityRefLink';
+export * from './EntityProvider';

plugins/catalog/src/components/CatalogFilter/AllServicesCount.tsx

@@ -15,10 +15,10 @@
  */
 
 import { useApi } from '@backstage/core';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { CircularProgress, useTheme } from '@material-ui/core';
 import React from 'react';
 import { useAsync } from 'react-use';
-import { catalogApiRef } from '../../plugin';
 
 export const AllServicesCount = () => {
   const theme = useTheme();

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

@@ -23,11 +23,11 @@ import {
   identityApiRef,
   storageApiRef,
 } from '@backstage/core';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { MockStorageApi, wrapInTestApp } from '@backstage/test-utils';
 import { fireEvent, render, waitFor } from '@testing-library/react';
 import React from 'react';
 import { EntityFilterGroupsProvider } from '../../filter';
-import { catalogApiRef } from '../../plugin';
 import { ButtonGroup, CatalogFilter } from './CatalogFilter';
 
 describe('Catalog Filter', () => {

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

@@ -28,11 +28,11 @@ import {
   ProfileInfo,
   storageApiRef,
 } from '@backstage/core';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { MockStorageApi, wrapInTestApp } from '@backstage/test-utils';
 import { fireEvent, render } from '@testing-library/react';
 import React from 'react';
 import { EntityFilterGroupsProvider } from '../../filter';
-import { catalogApiRef } from '../../plugin';
 import { CatalogPage } from './CatalogPage';
 
 describe('CatalogPage', () => {

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

@@ -23,11 +23,11 @@ import {
   identityApiRef,
   storageApiRef,
 } from '@backstage/core';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { MockStorageApi, wrapInTestApp } from '@backstage/test-utils';
 import { render } from '@testing-library/react';
 import React from 'react';
 import { EntityFilterGroupsProvider } from '../../filter';
-import { catalogApiRef } from '../../plugin';
 import { ResultsFilter } from './ResultsFilter';
 
 describe('Results Filter', () => {

plugins/catalog/src/filter/useEntityFilterGroup.test.tsx

@@ -15,10 +15,10 @@
  */
 
 import { ApiProvider, ApiRegistry, storageApiRef } from '@backstage/core';
+import { catalogApiRef } from '@backstage/plugin-catalog-react';
 import { MockStorageApi } from '@backstage/test-utils';
 import { act, renderHook } from '@testing-library/react-hooks';
 import React from 'react';
-import { catalogApiRef } from '../plugin';
 import { EntityFilterGroupsProvider } from './EntityFilterGroupsProvider';
 import { FilterGroup, FilterGroupStatesReady } from './types';
 import { useEntityFilterGroup } from './useEntityFilterGroup';

plugins/catalog/src/index.ts

@@ -17,7 +17,6 @@
 export { AboutCard } from './components/AboutCard';
 export { EntityLayout } from './components/EntityLayout';
 export { EntityPageLayout } from './components/EntityPageLayout';
-export { EntityProvider } from './components/EntityProvider';
 export * from './components/EntitySwitch';
 export { Router } from './components/Router';
 export * from './extensions';