From 8997d3fccadcd62af7437b8737a4f159b4578491 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 17 Jun 2021 20:12:27 +0200 Subject: [PATCH] packages: manually migrate rest away from @backstage/core deps Signed-off-by: Patrik Oldsberg --- packages/app/package.json | 6 +++--- packages/cli/package.json | 4 +++- .../templates/default-app/packages/app/package.json.hbs | 4 +++- packages/dev-utils/package.json | 4 +++- packages/integration-react/package.json | 3 ++- plugins/catalog-react/package.json | 4 ++-- plugins/cost-insights/src/testUtils/providers.tsx | 2 ++ plugins/explore-react/package.json | 2 +- .../Cards/Group/MembersList/MembersListCard.stories.tsx | 2 +- .../Cards/OwnershipCard/OwnershipCard.stories.tsx | 2 +- 10 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 9d22f6bf28..1a9f0c4add 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -6,10 +6,10 @@ "dependencies": { "@backstage/catalog-model": "^0.8.3", "@backstage/cli": "^0.7.1", - "@backstage/core": "^0.7.13", - "@backstage/integration-react": "^0.1.3", "@backstage/core-app-api": "^0.1.2", - "@backstage/core-components": "^0.1.1", + "@backstage/core-components": "^0.1.3", + "@backstage/core-plugin-api": "^0.1.2", + "@backstage/integration-react": "^0.1.3", "@backstage/plugin-api-docs": "^0.5.0", "@backstage/plugin-badges": "^0.2.2", "@backstage/plugin-catalog": "^0.6.3", diff --git a/packages/cli/package.json b/packages/cli/package.json index a9f34cb7ac..c5799a4aa4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -120,7 +120,9 @@ "devDependencies": { "@backstage/backend-common": "^0.8.3", "@backstage/config": "^0.1.5", - "@backstage/core": "^0.7.13", + "@backstage/core-components": "^0.1.3", + "@backstage/core-plugin-api": "^0.1.2", + "@backstage/core-app-api": "^0.1.2", "@backstage/dev-utils": "^0.1.17", "@backstage/test-utils": "^0.1.13", "@backstage/theme": "^0.2.8", diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 6038f7c8b9..71cc86ba34 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -6,7 +6,9 @@ "dependencies": { "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}", "@backstage/cli": "^{{version '@backstage/cli'}}", - "@backstage/core": "^{{version '@backstage/core'}}", + "@backstage/core-app-api": "^{{version '@backstage/core-app-api'}}", + "@backstage/core-components": "^{{version '@backstage/core-components'}}", + "@backstage/core-plugin-api": "^{{version '@backstage/core-plugin-api'}}", "@backstage/integration-react": "^{{version '@backstage/integration-react'}}", "@backstage/plugin-api-docs": "^{{version '@backstage/plugin-api-docs'}}", "@backstage/plugin-catalog": "^{{version '@backstage/plugin-catalog'}}", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 100d06b1a0..1f3a408e04 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -29,7 +29,9 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/core": "^0.7.12", + "@backstage/core-app-api": "^0.1.2", + "@backstage/core-components": "^0.1.3", + "@backstage/core-plugin-api": "^0.1.2", "@backstage/catalog-model": "^0.8.2", "@backstage/integration-react": "^0.1.3", "@backstage/plugin-catalog-react": "^0.2.2", diff --git a/packages/integration-react/package.json b/packages/integration-react/package.json index 313e5b8783..edc6acf110 100644 --- a/packages/integration-react/package.json +++ b/packages/integration-react/package.json @@ -21,7 +21,8 @@ }, "dependencies": { "@backstage/config": "^0.1.2", - "@backstage/core": "^0.7.9", + "@backstage/core-components": "^0.1.3", + "@backstage/core-plugin-api": "^0.1.2", "@backstage/integration": "^0.5.6", "@backstage/theme": "^0.2.3", "@material-ui/core": "^4.11.0", diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index c5a871620b..c9af3c75e8 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -30,7 +30,8 @@ "dependencies": { "@backstage/catalog-client": "^0.3.13", "@backstage/catalog-model": "^0.8.3", - "@backstage/core": "^0.7.13", + "@backstage/core-app-api": "^0.1.2", + "@backstage/core-components": "^0.1.3", "@backstage/core-plugin-api": "^0.1.2", "@backstage/integration": "^0.5.6", "@material-ui/core": "^4.11.0", @@ -45,7 +46,6 @@ }, "devDependencies": { "@backstage/cli": "^0.7.1", - "@backstage/core": "^0.7.13", "@backstage/dev-utils": "^0.1.17", "@backstage/test-utils": "^0.1.13", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/cost-insights/src/testUtils/providers.tsx b/plugins/cost-insights/src/testUtils/providers.tsx index 90a8839f99..93d1b0eea5 100644 --- a/plugins/cost-insights/src/testUtils/providers.tsx +++ b/plugins/cost-insights/src/testUtils/providers.tsx @@ -28,6 +28,8 @@ import { import { ScrollContext, ScrollContextProps } from '../hooks/useScroll'; import { Group, Duration } from '../types'; +// TODO(Rugvip): Could be good to have a clear place to put test utils that is linted accordingly +// eslint-disable-next-line import/no-extraneous-dependencies import { ApiProvider, ApiRegistry } from '@backstage/core-app-api'; import { IdentityApi, identityApiRef } from '@backstage/core-plugin-api'; diff --git a/plugins/explore-react/package.json b/plugins/explore-react/package.json index cb178e9ae6..e19653ba89 100644 --- a/plugins/explore-react/package.json +++ b/plugins/explore-react/package.json @@ -28,7 +28,7 @@ "postpack": "backstage-cli postpack" }, "dependencies": { - "@backstage/core": "^0.7.9" + "@backstage/core-plugin-api": "^0.1.2" }, "devDependencies": { "@backstage/cli": "^0.7.0", diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx index 482762559b..e1bc18aa16 100644 --- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx +++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.stories.tsx @@ -15,7 +15,7 @@ */ import { Entity, GroupEntity } from '@backstage/catalog-model'; -import { ApiProvider, ApiRegistry } from '@backstage/core-api'; +import { ApiProvider, ApiRegistry } from '@backstage/core-app-api'; import { catalogApiRef, EntityContext } from '@backstage/plugin-catalog-react'; import { Grid } from '@material-ui/core'; import React from 'react'; diff --git a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx index 1e09a45632..99c8198404 100644 --- a/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx +++ b/plugins/org/src/components/Cards/OwnershipCard/OwnershipCard.stories.tsx @@ -15,7 +15,7 @@ */ import { GroupEntity } from '@backstage/catalog-model'; -import { ApiProvider, ApiRegistry } from '@backstage/core-api'; +import { ApiProvider, ApiRegistry } from '@backstage/core-app-api'; import { CatalogApi, catalogApiRef,