From 31f32bbebccada9045f3e387716cc283ea2ffeab Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 20 Dec 2022 16:40:32 +0100 Subject: [PATCH] chore: moving the routeRefs to the new `scaffolder-react` package Signed-off-by: blam --- plugins/scaffolder-react/.eslintrc.js | 1 + plugins/scaffolder-react/README.md | 14 ++++ plugins/scaffolder-react/package.json | 68 +++++++++++++++++++ plugins/scaffolder-react/src/index.ts | 17 +++++ .../src/routes.ts | 0 plugins/scaffolder/package.json | 1 + .../ActionsPage/ActionsPage.test.tsx | 2 +- .../ListTasksPage/ListTaskPage.test.tsx | 2 +- .../ListTasksPage/ListTasksPage.tsx | 2 +- .../MultistepJsonForm/MultistepJsonForm.tsx | 2 +- plugins/scaffolder/src/components/Router.tsx | 2 +- .../ScaffolderPage/ScaffolderPage.tsx | 2 +- .../ScaffolderPageContextMenu.test.tsx | 2 +- .../ScaffolderPageContextMenu.tsx | 2 +- .../src/components/TaskPage/TaskPage.tsx | 2 +- .../components/TemplateCard/TemplateCard.tsx | 5 +- .../TemplatePage/TemplatePage.test.tsx | 2 +- .../components/TemplatePage/TemplatePage.tsx | 2 +- plugins/scaffolder/src/index.ts | 4 +- plugins/scaffolder/src/next/Router/Router.tsx | 2 +- .../TemplateCard/TemplateCard.test.tsx | 2 +- .../TemplateCard/TemplateCard.tsx | 2 +- .../TemplateListPage.test.tsx | 2 +- .../TemplateListPage/TemplateListPage.tsx | 2 +- .../TemplateWizardPage/Stepper/Stepper.tsx | 2 +- .../TemplateWizardPage.test.tsx | 2 +- .../TemplateWizardPage/TemplateWizardPage.tsx | 2 +- plugins/scaffolder/src/plugin.tsx | 2 +- yarn.lock | 32 +++++++++ 29 files changed, 160 insertions(+), 22 deletions(-) create mode 100644 plugins/scaffolder-react/.eslintrc.js create mode 100644 plugins/scaffolder-react/README.md create mode 100644 plugins/scaffolder-react/package.json create mode 100644 plugins/scaffolder-react/src/index.ts rename plugins/{scaffolder => scaffolder-react}/src/routes.ts (100%) diff --git a/plugins/scaffolder-react/.eslintrc.js b/plugins/scaffolder-react/.eslintrc.js new file mode 100644 index 0000000000..e2a53a6ad2 --- /dev/null +++ b/plugins/scaffolder-react/.eslintrc.js @@ -0,0 +1 @@ +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); diff --git a/plugins/scaffolder-react/README.md b/plugins/scaffolder-react/README.md new file mode 100644 index 0000000000..8e93bff28a --- /dev/null +++ b/plugins/scaffolder-react/README.md @@ -0,0 +1,14 @@ +# Scaffolder React + +WORK IN PROGRESS + +This is shared code of the frontend part of the default Scaffolder plugin. + +It will implement the core API for working with the Scaffolder, and +supplies components that can be reused by third-party plugins. + +## Links + +- [Frontend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/scaffolder) +- [Backend part of the plugin](https://github.com/backstage/backstage/tree/master/plugins/scaffolder-backend) +- [The Backstage homepage](https://backstage.io) diff --git a/plugins/scaffolder-react/package.json b/plugins/scaffolder-react/package.json new file mode 100644 index 0000000000..d87ebff860 --- /dev/null +++ b/plugins/scaffolder-react/package.json @@ -0,0 +1,68 @@ +{ + "name": "@backstage/plugin-scaffolder-react", + "description": "A frontend library that helps other Backstage plugins interact with the Scaffolder", + "version": "1.0.0", + "main": "src/index.ts", + "types": "src/index.ts", + "license": "Apache-2.0", + "publishConfig": { + "access": "public", + "main": "dist/index.esm.js", + "types": "dist/index.d.ts", + "alphaTypes": "dist/index.alpha.d.ts" + }, + "backstage": { + "role": "web-library" + }, + "homepage": "https://backstage.io", + "repository": { + "type": "git", + "url": "https://github.com/backstage/backstage", + "directory": "plugins/scaffolder-react" + }, + "keywords": [ + "backstage" + ], + "scripts": { + "build": "backstage-cli package build --experimental-type-build", + "lint": "backstage-cli package lint", + "test": "backstage-cli package test", + "prepack": "backstage-cli package prepack", + "postpack": "backstage-cli package postpack", + "clean": "backstage-cli package clean", + "start": "backstage-cli package start" + }, + "dependencies": { + "@backstage/catalog-client": "workspace:^", + "@backstage/catalog-model": "workspace:^", + "@backstage/core-components": "workspace:^", + "@backstage/core-plugin-api": "workspace:^", + "@backstage/errors": "workspace:^", + "@backstage/theme": "workspace:^", + "@backstage/types": "workspace:^", + "@backstage/version-bridge": "workspace:^", + "@material-ui/core": "^4.12.2", + "@material-ui/icons": "^4.9.1", + "@material-ui/lab": "4.0.0-alpha.57" + }, + "peerDependencies": { + "@types/react": "^16.13.1 || ^17.0.0", + "react": "^16.13.1 || ^17.0.0", + "react-router-dom": "6.0.0-beta.0 || ^6.3.0" + }, + "devDependencies": { + "@backstage/cli": "workspace:^", + "@backstage/core-app-api": "workspace:^", + "@backstage/plugin-catalog-common": "workspace:^", + "@backstage/plugin-scaffolder-common": "workspace:^", + "@backstage/test-utils": "workspace:^", + "@testing-library/jest-dom": "^5.10.1", + "@testing-library/react": "^12.1.3", + "@testing-library/react-hooks": "^8.0.0", + "@testing-library/user-event": "^14.0.0" + }, + "files": [ + "dist", + "alpha" + ] +} diff --git a/plugins/scaffolder-react/src/index.ts b/plugins/scaffolder-react/src/index.ts new file mode 100644 index 0000000000..3121231047 --- /dev/null +++ b/plugins/scaffolder-react/src/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright 2022 The Backstage Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './routes'; diff --git a/plugins/scaffolder/src/routes.ts b/plugins/scaffolder-react/src/routes.ts similarity index 100% rename from plugins/scaffolder/src/routes.ts rename to plugins/scaffolder-react/src/routes.ts diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index fd463c5d33..3431c46655 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -45,6 +45,7 @@ "@backstage/plugin-catalog-react": "workspace:^", "@backstage/plugin-permission-react": "workspace:^", "@backstage/plugin-scaffolder-common": "workspace:^", + "@backstage/plugin-scaffolder-react": "workspace:^", "@backstage/theme": "workspace:^", "@backstage/types": "workspace:^", "@codemirror/language": "^6.0.0", diff --git a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx index 02f3c066ca..ee94c5ecd3 100644 --- a/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx +++ b/plugins/scaffolder/src/components/ActionsPage/ActionsPage.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { scaffolderApiRef } from '../../api'; import { ActionsPage } from './ActionsPage'; -import { rootRouteRef } from '../../routes'; +import { rootRouteRef } from '@backstage/plugin-scaffolder-react'; import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils'; import { ApiProvider } from '@backstage/core-app-api'; import { ScaffolderApi } from '../../types'; diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx index 57dde13a43..7188aed082 100644 --- a/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx +++ b/plugins/scaffolder/src/components/ListTasksPage/ListTaskPage.test.tsx @@ -26,7 +26,7 @@ import { identityApiRef } from '@backstage/core-plugin-api'; import { ListTasksPage } from './ListTasksPage'; import { ScaffolderApi } from '../../types'; import { scaffolderApiRef } from '../../api'; -import { rootRouteRef } from '../../routes'; +import { rootRouteRef } from '@backstage/plugin-scaffolder-react'; import { act, fireEvent } from '@testing-library/react'; describe('', () => { diff --git a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx index 0b00879d43..0685b42a59 100644 --- a/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx +++ b/plugins/scaffolder/src/components/ListTasksPage/ListTasksPage.tsx @@ -29,7 +29,7 @@ import { CatalogFilterLayout } from '@backstage/plugin-catalog-react'; import useAsync from 'react-use/lib/useAsync'; import React, { useState } from 'react'; import { scaffolderApiRef } from '../../api'; -import { rootRouteRef } from '../../routes'; +import { rootRouteRef } from '@backstage/plugin-scaffolder-react'; import { ScaffolderTask } from '../../types'; import { OwnerListPicker } from './OwnerListPicker'; import { diff --git a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx index 1fc63b2b61..0ca331ab52 100644 --- a/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx +++ b/plugins/scaffolder/src/components/MultistepJsonForm/MultistepJsonForm.tsx @@ -39,7 +39,7 @@ import * as fieldOverrides from './FieldOverrides'; import { LayoutOptions } from '../../layouts'; import { ReviewStepProps } from '../types'; import { ReviewStep } from './ReviewStep'; -import { selectedTemplateRouteRef } from '../../routes'; +import { selectedTemplateRouteRef } from '@backstage/plugin-scaffolder-react'; import { extractSchemaFromStep } from '../../next/TemplateWizardPage/Stepper/schema'; const Form = withTheme(MuiTheme); diff --git a/plugins/scaffolder/src/components/Router.tsx b/plugins/scaffolder/src/components/Router.tsx index 644b26eeb8..13ef9ed43f 100644 --- a/plugins/scaffolder/src/components/Router.tsx +++ b/plugins/scaffolder/src/components/Router.tsx @@ -43,7 +43,7 @@ import { scaffolderListTaskRouteRef, scaffolderTaskRouteRef, selectedTemplateRouteRef, -} from '../routes'; +} from '@backstage/plugin-scaffolder-react'; import { ListTasksPage } from './ListTasksPage'; import { LayoutOptions, LAYOUTS_KEY, LAYOUTS_WRAPPER_KEY } from '../layouts'; import { ReviewStepProps } from './types'; diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx index 9c13db72b1..7306ae8fd4 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPage.tsx @@ -34,7 +34,7 @@ import { UserListPicker, } from '@backstage/plugin-catalog-react'; import React, { ComponentType } from 'react'; -import { registerComponentRouteRef } from '../../routes'; +import { registerComponentRouteRef } from '@backstage/plugin-scaffolder-react'; import { TemplateList } from '../TemplateList'; import { TemplateTypePicker } from '../TemplateTypePicker'; import { catalogEntityCreatePermission } from '@backstage/plugin-catalog-common'; diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx index 02869bb6da..d9993c16e7 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.test.tsx @@ -18,7 +18,7 @@ import userEvent from '@testing-library/user-event'; import { renderInTestApp } from '@backstage/test-utils'; import { screen } from '@testing-library/react'; import React from 'react'; -import { rootRouteRef } from '../../routes'; +import { rootRouteRef } from '@backstage/plugin-scaffolder-react'; import { ScaffolderPageContextMenu } from './ScaffolderPageContextMenu'; describe('ScaffolderPageContextMenu', () => { diff --git a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx index 9e69fae68d..3c62a34e29 100644 --- a/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx +++ b/plugins/scaffolder/src/components/ScaffolderPage/ScaffolderPageContextMenu.tsx @@ -32,7 +32,7 @@ import { actionsRouteRef, editRouteRef, scaffolderListTaskRouteRef, -} from '../../routes'; +} from '@backstage/plugin-scaffolder-react'; const useStyles = makeStyles({ button: { diff --git a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx index 699ce119fb..42f6e6fd30 100644 --- a/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx +++ b/plugins/scaffolder/src/components/TaskPage/TaskPage.tsx @@ -51,7 +51,7 @@ import { rootRouteRef, scaffolderTaskRouteRef, selectedTemplateRouteRef, -} from '../../routes'; +} from '@backstage/plugin-scaffolder-react'; import { ScaffolderTaskStatus, ScaffolderTaskOutput } from '../../types'; import { useTaskEventStream } from '../hooks/useEventStream'; import { TaskErrors } from './TaskErrors'; diff --git a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx index 984e51f3b5..bf9e022296 100644 --- a/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx +++ b/plugins/scaffolder/src/components/TemplateCard/TemplateCard.tsx @@ -61,7 +61,10 @@ import { import LanguageIcon from '@material-ui/icons/Language'; import WarningIcon from '@material-ui/icons/Warning'; import React from 'react'; -import { selectedTemplateRouteRef, viewTechDocRouteRef } from '../../routes'; +import { + selectedTemplateRouteRef, + viewTechDocRouteRef, +} from '@backstage/plugin-scaffolder-react'; const useStyles = makeStyles(theme => ({ cardHeader: { diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx index 0535df5ef4..7b54d047e7 100644 --- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx +++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.test.tsx @@ -24,7 +24,7 @@ import React from 'react'; import { Route, Routes } from 'react-router-dom'; import { scaffolderApiRef } from '../../api'; import { ScaffolderApi } from '../../types'; -import { rootRouteRef } from '../../routes'; +import { rootRouteRef } from '@backstage/plugin-scaffolder-react'; import { TemplatePage } from './TemplatePage'; import { featureFlagsApiRef, diff --git a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx index e5dcc5d9bf..5d02bc436d 100644 --- a/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx +++ b/plugins/scaffolder/src/components/TemplatePage/TemplatePage.tsx @@ -26,7 +26,7 @@ import { rootRouteRef, scaffolderTaskRouteRef, selectedTemplateRouteRef, -} from '../../routes'; +} from '@backstage/plugin-scaffolder-react'; import { MultistepJsonForm } from '../MultistepJsonForm'; import { createValidator } from './createValidator'; diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts index 1ed1346176..c18abf92fd 100644 --- a/plugins/scaffolder/src/index.ts +++ b/plugins/scaffolder/src/index.ts @@ -62,12 +62,14 @@ export { scaffolderPlugin, } from './plugin'; export * from './components'; + export { rootRouteRef, nextRouteRef, selectedTemplateRouteRef, nextSelectedTemplateRouteRef, -} from './routes'; +} from '@backstage/plugin-scaffolder-react'; + export type { TaskPageProps } from './components/TaskPage'; /** next exports */ diff --git a/plugins/scaffolder/src/next/Router/Router.tsx b/plugins/scaffolder/src/next/Router/Router.tsx index 7a2d2826e7..97985642f9 100644 --- a/plugins/scaffolder/src/next/Router/Router.tsx +++ b/plugins/scaffolder/src/next/Router/Router.tsx @@ -28,7 +28,7 @@ import { import { useElementFilter } from '@backstage/core-plugin-api'; import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common'; import { TemplateGroupFilter } from '../TemplateListPage/TemplateGroups'; -import { nextSelectedTemplateRouteRef } from '../../routes'; +import { nextSelectedTemplateRouteRef } from '@backstage/plugin-scaffolder-react'; import { SecretsContextProvider } from '../../components/secrets/SecretsContext'; import type { FormProps } from '../types'; diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx index 4648d47af1..cb4e8428cd 100644 --- a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx +++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.test.tsx @@ -25,7 +25,7 @@ import { } from '@backstage/test-utils'; import { TemplateCard } from './TemplateCard'; import React from 'react'; -import { nextRouteRef } from '../../../routes'; +import { nextRouteRef } from '@backstage/plugin-scaffolder-react'; import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common'; import { RELATION_OWNED_BY } from '@backstage/catalog-model'; diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx index 67b50ba8d6..b5c852949c 100644 --- a/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx +++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateCard/TemplateCard.tsx @@ -42,7 +42,7 @@ import React from 'react'; import { nextSelectedTemplateRouteRef, viewTechDocRouteRef, -} from '../../../routes'; +} from '@backstage/plugin-scaffolder-react'; import { CardHeader } from './CardHeader'; import { CardLink } from './CardLink'; diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx index 26e2994c8a..16beeabd32 100644 --- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx +++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.test.tsx @@ -25,7 +25,7 @@ import { TestApiProvider, } from '@backstage/test-utils'; import React from 'react'; -import { nextRouteRef } from '../../routes'; +import { nextRouteRef } from '@backstage/plugin-scaffolder-react'; import { TemplateListPage } from './TemplateListPage'; describe('TemplateListPage', () => { diff --git a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx index 003c3aa98b..bb77ed6479 100644 --- a/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx +++ b/plugins/scaffolder/src/next/TemplateListPage/TemplateListPage.tsx @@ -35,7 +35,7 @@ import { import { CategoryPicker } from './CategoryPicker'; import { RegisterExistingButton } from './RegisterExistingButton'; import { useRouteRef } from '@backstage/core-plugin-api'; -import { registerComponentRouteRef } from '../../routes'; +import { registerComponentRouteRef } from '@backstage/plugin-scaffolder-react'; import { TemplateGroupFilter, TemplateGroups } from './TemplateGroups'; export type TemplateListPageProps = { diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx index d4d57eed22..e285c21c6f 100644 --- a/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx +++ b/plugins/scaffolder/src/next/TemplateWizardPage/Stepper/Stepper.tsx @@ -35,7 +35,7 @@ import { createAsyncValidators } from './createAsyncValidators'; import { useTemplateSchema } from './useTemplateSchema'; import { ReviewState } from './ReviewState'; import validator from '@rjsf/validator-ajv6'; -import { selectedTemplateRouteRef } from '../../../routes'; +import { selectedTemplateRouteRef } from '@backstage/plugin-scaffolder-react'; import { useFormData } from './useFormData'; import { FormProps } from '../../types'; diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx index f36fae9aa3..854cfc6545 100644 --- a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx +++ b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.test.tsx @@ -23,7 +23,7 @@ import { import { act, fireEvent } from '@testing-library/react'; import React from 'react'; import { scaffolderApiRef } from '../../api'; -import { nextRouteRef, rootRouteRef } from '../../routes'; +import { nextRouteRef, rootRouteRef } from '@backstage/plugin-scaffolder-react'; import { ScaffolderApi } from '../../types'; import { TemplateWizardPage } from './TemplateWizardPage'; diff --git a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx index 92b6b005ea..aece4e427e 100644 --- a/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx +++ b/plugins/scaffolder/src/next/TemplateWizardPage/TemplateWizardPage.tsx @@ -41,7 +41,7 @@ import { nextRouteRef, scaffolderTaskRouteRef, selectedTemplateRouteRef, -} from '../../routes'; +} from '@backstage/plugin-scaffolder-react'; import { SecretsContext } from '../../components/secrets/SecretsContext'; import { JsonValue } from '@backstage/types'; import type { FormProps } from '../types'; diff --git a/plugins/scaffolder/src/plugin.tsx b/plugins/scaffolder/src/plugin.tsx index cfa7af8128..f6a8915c48 100644 --- a/plugins/scaffolder/src/plugin.tsx +++ b/plugins/scaffolder/src/plugin.tsx @@ -40,7 +40,7 @@ import { registerComponentRouteRef, rootRouteRef, viewTechDocRouteRef, -} from './routes'; +} from '@backstage/plugin-scaffolder-react'; import { createApiFactory, createPlugin, diff --git a/yarn.lock b/yarn.lock index 588d41c776..0ad909a7a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7450,6 +7450,37 @@ __metadata: languageName: unknown linkType: soft +"@backstage/plugin-scaffolder-react@workspace:^, @backstage/plugin-scaffolder-react@workspace:plugins/scaffolder-react": + version: 0.0.0-use.local + resolution: "@backstage/plugin-scaffolder-react@workspace:plugins/scaffolder-react" + dependencies: + "@backstage/catalog-client": "workspace:^" + "@backstage/catalog-model": "workspace:^" + "@backstage/cli": "workspace:^" + "@backstage/core-app-api": "workspace:^" + "@backstage/core-components": "workspace:^" + "@backstage/core-plugin-api": "workspace:^" + "@backstage/errors": "workspace:^" + "@backstage/plugin-catalog-common": "workspace:^" + "@backstage/plugin-scaffolder-common": "workspace:^" + "@backstage/test-utils": "workspace:^" + "@backstage/theme": "workspace:^" + "@backstage/types": "workspace:^" + "@backstage/version-bridge": "workspace:^" + "@material-ui/core": ^4.12.2 + "@material-ui/icons": ^4.9.1 + "@material-ui/lab": 4.0.0-alpha.57 + "@testing-library/jest-dom": ^5.10.1 + "@testing-library/react": ^12.1.3 + "@testing-library/react-hooks": ^8.0.0 + "@testing-library/user-event": ^14.0.0 + peerDependencies: + "@types/react": ^16.13.1 || ^17.0.0 + react: ^16.13.1 || ^17.0.0 + react-router-dom: 6.0.0-beta.0 || ^6.3.0 + languageName: unknown + linkType: soft + "@backstage/plugin-scaffolder@workspace:^, @backstage/plugin-scaffolder@workspace:plugins/scaffolder": version: 0.0.0-use.local resolution: "@backstage/plugin-scaffolder@workspace:plugins/scaffolder" @@ -7470,6 +7501,7 @@ __metadata: "@backstage/plugin-catalog-react": "workspace:^" "@backstage/plugin-permission-react": "workspace:^" "@backstage/plugin-scaffolder-common": "workspace:^" + "@backstage/plugin-scaffolder-react": "workspace:^" "@backstage/test-utils": "workspace:^" "@backstage/theme": "workspace:^" "@backstage/types": "workspace:^"