From 9f268f466c7ea948fbed74460776dc76e61e238e Mon Sep 17 00:00:00 2001 From: nikolar Date: Fri, 20 Dec 2024 10:27:38 -0800 Subject: [PATCH] remove scaffolder changes Signed-off-by: nikolar --- .changeset/big-seals-drum.md | 8 +------ plugins/scaffolder-react/report-alpha.api.md | 8 +++---- plugins/scaffolder-react/report.api.md | 24 ------------------- plugins/scaffolder-react/src/index.ts | 6 ----- .../src/next/components/Stepper/Stepper.tsx | 2 +- .../TemplateCategoryPicker.tsx | 2 +- .../src/next/overridableComponents.ts | 4 ++-- 7 files changed, 9 insertions(+), 45 deletions(-) diff --git a/.changeset/big-seals-drum.md b/.changeset/big-seals-drum.md index 27af4e6ee9..df13cdf687 100644 --- a/.changeset/big-seals-drum.md +++ b/.changeset/big-seals-drum.md @@ -1,13 +1,7 @@ --- -'@backstage/plugin-scaffolder-react': patch '@backstage/plugin-home': patch --- -Added missing exports to surface recently added plugin changes as follows: -`@backstage/plugin-scaffolder-react` - -- add exports needed to override template styles for `BackstageTemplateStepper` and `ScaffolderReactTemplateCategoryPicker` - -`@backstage/plugin-home` +Added missing exports to surface recently added plugin in `@backstage/plugin-home` - add exports needed to have a valid `import { QuickStartCard } from '@backstage/plugin-home';` diff --git a/plugins/scaffolder-react/report-alpha.api.md b/plugins/scaffolder-react/report-alpha.api.md index 11c2d11378..4f9f86d1ac 100644 --- a/plugins/scaffolder-react/report-alpha.api.md +++ b/plugins/scaffolder-react/report-alpha.api.md @@ -46,14 +46,14 @@ import { UiSchema } from '@rjsf/utils'; import { WidgetProps } from '@rjsf/utils'; import { z } from 'zod'; -// @public (undocumented) +// @alpha (undocumented) export type BackstageOverrides = Overrides & { [Name in keyof ScaffolderReactComponentsNameToClassKey]?: Partial< StyleRules >; }; -// @public (undocumented) +// @alpha (undocumented) export type BackstageTemplateStepperClassKey = | 'backButton' | 'footer' @@ -296,13 +296,13 @@ export type ScaffolderPageContextMenuProps = { onCreateClicked?: () => void; }; -// @public (undocumented) +// @alpha (undocumented) export type ScaffolderReactComponentsNameToClassKey = { ScaffolderReactTemplateCategoryPicker: ScaffolderReactTemplateCategoryPickerClassKey; BackstageTemplateStepper: BackstageTemplateStepperClassKey; }; -// @public (undocumented) +// @alpha (undocumented) export type ScaffolderReactTemplateCategoryPickerClassKey = 'root' | 'label'; // @alpha diff --git a/plugins/scaffolder-react/report.api.md b/plugins/scaffolder-react/report.api.md index c733b142c0..8a6b4739a4 100644 --- a/plugins/scaffolder-react/report.api.md +++ b/plugins/scaffolder-react/report.api.md @@ -27,7 +27,6 @@ import { JsonObject } from '@backstage/types'; import { JSONSchema7 } from 'json-schema'; import { JsonValue } from '@backstage/types'; import { Observable } from '@backstage/types'; -import { Overrides } from '@material-ui/core/styles/overrides'; import { PropsWithChildren } from 'react'; import { default as React_2 } from 'react'; import { ReactNode } from 'react'; @@ -37,7 +36,6 @@ import { RegistryWidgetsType } from '@rjsf/utils'; import { RJSFSchema } from '@rjsf/utils'; import { RJSFValidationError } from '@rjsf/utils'; import { StrictRJSFSchema } from '@rjsf/utils'; -import { StyleRules } from '@material-ui/core/styles/withStyles'; import { TaskSpec } from '@backstage/plugin-scaffolder-common'; import { TaskStep } from '@backstage/plugin-scaffolder-common'; import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common'; @@ -65,19 +63,6 @@ export type ActionExample = { example: string; }; -// @public (undocumented) -export type BackstageOverrides = Overrides & { - [Name in keyof ScaffolderReactComponentsNameToClassKey]?: Partial< - StyleRules - >; -}; - -// @public (undocumented) -export type BackstageTemplateStepperClassKey = - | 'backButton' - | 'footer' - | 'formWrapper'; - // @public export function createScaffolderFieldExtension< TReturnValue = unknown, @@ -340,15 +325,6 @@ export type ScaffolderOutputText = { default?: boolean; }; -// @public (undocumented) -export type ScaffolderReactComponentsNameToClassKey = { - ScaffolderReactTemplateCategoryPicker: ScaffolderReactTemplateCategoryPickerClassKey; - BackstageTemplateStepper: BackstageTemplateStepperClassKey; -}; - -// @public (undocumented) -export type ScaffolderReactTemplateCategoryPickerClassKey = 'root' | 'label'; - // @public export type ScaffolderRJSFField< T = any, diff --git a/plugins/scaffolder-react/src/index.ts b/plugins/scaffolder-react/src/index.ts index 69bb70598c..e73df50fce 100644 --- a/plugins/scaffolder-react/src/index.ts +++ b/plugins/scaffolder-react/src/index.ts @@ -22,9 +22,3 @@ export * from './api'; export * from './hooks'; export * from './layouts'; export * from './utils'; -export type { - BackstageOverrides, - ScaffolderReactComponentsNameToClassKey, - ScaffolderReactTemplateCategoryPickerClassKey, - BackstageTemplateStepperClassKey, -} from './next'; diff --git a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx index fd5d394ef6..0b4cbbc94a 100644 --- a/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx +++ b/plugins/scaffolder-react/src/next/components/Stepper/Stepper.tsx @@ -56,7 +56,7 @@ import { merge } from 'lodash'; const validator = customizeValidator(); ajvErrors(validator.ajv); -/** @public */ +/** @alpha */ export type BackstageTemplateStepperClassKey = | 'backButton' | 'footer' diff --git a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx index 335f51b3e1..f2505ec148 100644 --- a/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx +++ b/plugins/scaffolder-react/src/next/components/TemplateCategoryPicker/TemplateCategoryPicker.tsx @@ -33,7 +33,7 @@ import { alertApiRef, useApi } from '@backstage/core-plugin-api'; const icon = ; const checkedIcon = ; -/** @public */ +/** @alpha */ export type ScaffolderReactTemplateCategoryPickerClassKey = 'root' | 'label'; const useStyles = makeStyles( diff --git a/plugins/scaffolder-react/src/next/overridableComponents.ts b/plugins/scaffolder-react/src/next/overridableComponents.ts index d35a70b4bf..2045496166 100644 --- a/plugins/scaffolder-react/src/next/overridableComponents.ts +++ b/plugins/scaffolder-react/src/next/overridableComponents.ts @@ -19,13 +19,13 @@ import { StyleRules } from '@material-ui/core/styles/withStyles'; import { ScaffolderReactTemplateCategoryPickerClassKey } from './components/TemplateCategoryPicker/TemplateCategoryPicker'; import { BackstageTemplateStepperClassKey } from './components/Stepper/Stepper'; -/** @public */ +/** @alpha */ export type ScaffolderReactComponentsNameToClassKey = { ScaffolderReactTemplateCategoryPicker: ScaffolderReactTemplateCategoryPickerClassKey; BackstageTemplateStepper: BackstageTemplateStepperClassKey; }; -/** @public */ +/** @alpha */ export type BackstageOverrides = Overrides & { [Name in keyof ScaffolderReactComponentsNameToClassKey]?: Partial< StyleRules