diff --git a/plugins/home-react/package.json b/plugins/home-react/package.json index 0e94e3ee49..e6f96e65f4 100644 --- a/plugins/home-react/package.json +++ b/plugins/home-react/package.json @@ -33,25 +33,12 @@ "clean": "backstage-cli package clean" }, "dependencies": { - "@backstage/catalog-model": "workspace:^", - "@backstage/config": "workspace:^", "@backstage/core-components": "workspace:^", "@backstage/core-plugin-api": "workspace:^", - "@backstage/plugin-catalog-react": "workspace:^", - "@backstage/theme": "workspace:^", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "@material-ui/lab": "4.0.0-alpha.61", - "@rjsf/core-v5": "npm:@rjsf/core@5.6.0", - "@rjsf/material-ui": "5.6.0", "@rjsf/utils": "5.6.0", - "@rjsf/validator-ajv8": "5.6.0", - "@types/react": "^16.13.1 || ^17.0.0", - "lodash": "^4.17.21", - "react-grid-layout": "^1.3.4", - "react-resizable": "^3.0.4", - "react-use": "^17.2.4", - "zod": "~3.21.4" + "@types/react": "^16.13.1 || ^17.0.0" }, "peerDependencies": { "react": "^16.13.1 || ^17.0.0", diff --git a/plugins/home/src/extensions.tsx b/plugins/home/src/extensions.tsx index 380ff6713a..fdb9e9d67f 100644 --- a/plugins/home/src/extensions.tsx +++ b/plugins/home/src/extensions.tsx @@ -24,6 +24,7 @@ import { RJSFSchema } from '@rjsf/utils'; /** * @public + * @deprecated Please use the same type from `@backstage/plugin-home-react` instead */ export type ComponentRenderer = { Renderer?: (props: RendererProps) => JSX.Element; @@ -31,6 +32,7 @@ export type ComponentRenderer = { /** * @public + * @deprecated Please use the same type from `@backstage/plugin-home-react` instead */ export type ComponentParts = { Content: (props?: any) => JSX.Element; @@ -41,16 +43,19 @@ export type ComponentParts = { /** * @public + * @deprecated Please use the same type from `@backstage/plugin-home-react` instead */ export type RendererProps = { title: string } & ComponentParts; /** * @public + * @deprecated Please use the same type from `@backstage/plugin-home-react` instead */ export type CardExtensionProps = ComponentRenderer & { title?: string } & T; /** * @public + * @deprecated Please use the same type from `@backstage/plugin-home-react` instead */ export type CardLayout = { width?: { minColumns?: number; maxColumns?: number; defaultColumns?: number }; @@ -76,6 +81,7 @@ export type CardConfig = { * An extension creator to create card based components for the homepage * * @public + * @deprecated Please use the same type from `@backstage/plugin-home-react` instead */ export function createCardExtension(options: { title: string; diff --git a/plugins/stack-overflow/package.json b/plugins/stack-overflow/package.json index 5b9cdb0213..e550e15762 100644 --- a/plugins/stack-overflow/package.json +++ b/plugins/stack-overflow/package.json @@ -25,7 +25,7 @@ "@backstage/config": "workspace:^", "@backstage/core-components": "workspace:^", "@backstage/core-plugin-api": "workspace:^", - "@backstage/plugin-home": "workspace:^", + "@backstage/plugin-home-react": "workspace:^", "@backstage/plugin-search-common": "workspace:^", "@backstage/plugin-search-react": "workspace:^", "@backstage/theme": "workspace:^", diff --git a/plugins/stack-overflow/src/plugin.ts b/plugins/stack-overflow/src/plugin.ts index 5be4c89cbe..017900bc02 100644 --- a/plugins/stack-overflow/src/plugin.ts +++ b/plugins/stack-overflow/src/plugin.ts @@ -20,7 +20,7 @@ import { createApiFactory, configApiRef, } from '@backstage/core-plugin-api'; -import { createCardExtension } from '@backstage/plugin-home'; +import { createCardExtension } from '@backstage/plugin-home-react'; import { StackOverflowQuestionsContentProps } from './types'; import { stackOverflowApiRef, StackOverflowClient } from './api'; import { SearchResultListItemExtensionProps } from '@backstage/plugin-search-react'; diff --git a/yarn.lock b/yarn.lock index 78782deb48..b5fbc69c3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7036,27 +7036,19 @@ __metadata: languageName: unknown linkType: soft -"@backstage/plugin-home-react@workspace:plugins/home-react": +"@backstage/plugin-home-react@workspace:^, @backstage/plugin-home-react@workspace:plugins/home-react": version: 0.0.0-use.local resolution: "@backstage/plugin-home-react@workspace:plugins/home-react" dependencies: - "@backstage/catalog-model": "workspace:^" "@backstage/cli": "workspace:^" - "@backstage/config": "workspace:^" "@backstage/core-app-api": "workspace:^" "@backstage/core-components": "workspace:^" "@backstage/core-plugin-api": "workspace:^" "@backstage/dev-utils": "workspace:^" - "@backstage/plugin-catalog-react": "workspace:^" "@backstage/test-utils": "workspace:^" - "@backstage/theme": "workspace:^" "@material-ui/core": ^4.12.2 "@material-ui/icons": ^4.9.1 - "@material-ui/lab": 4.0.0-alpha.61 - "@rjsf/core-v5": "npm:@rjsf/core@5.6.0" - "@rjsf/material-ui": 5.6.0 "@rjsf/utils": 5.6.0 - "@rjsf/validator-ajv8": 5.6.0 "@testing-library/dom": ^8.0.0 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 @@ -7065,12 +7057,7 @@ __metadata: "@types/react": ^16.13.1 || ^17.0.0 "@types/react-grid-layout": ^1.3.2 cross-fetch: ^3.1.5 - lodash: ^4.17.21 msw: ^1.0.0 - react-grid-layout: ^1.3.4 - react-resizable: ^3.0.4 - react-use: ^17.2.4 - zod: ~3.21.4 peerDependencies: react: ^16.13.1 || ^17.0.0 react-dom: ^16.13.1 || ^17.0.0 @@ -8918,7 +8905,7 @@ __metadata: "@backstage/core-components": "workspace:^" "@backstage/core-plugin-api": "workspace:^" "@backstage/dev-utils": "workspace:^" - "@backstage/plugin-home": "workspace:^" + "@backstage/plugin-home-react": "workspace:^" "@backstage/plugin-search-common": "workspace:^" "@backstage/plugin-search-react": "workspace:^" "@backstage/test-utils": "workspace:^"