feat: make things nice here

Signed-off-by: blam <ben@blam.sh>

plugins/scaffolder-react/src/legacy/extensions/index.tsx

@@ -21,7 +21,7 @@ import {
 } from './types';
 import { Extension, attachComponentData } from '@backstage/core-plugin-api';
 import { FIELD_EXTENSION_KEY } from '../../extensions/keys';
-import { FieldExtensionComponent } from '../../extensions';
+import { FieldExtensionComponent } from '@backstage/plugin-scaffolder-react';
 
 /**
  * Method for creating field extensions that can be used in the scaffolder

plugins/scaffolder-react/src/legacy/extensions/types.ts

@@ -15,7 +15,7 @@
  */
 import { ApiHolder } from '@backstage/core-plugin-api';
 import { FieldValidation, FieldProps } from '@rjsf/core';
-import { CustomFieldExtensionSchema } from '../../extensions/types';
+import { CustomFieldExtensionSchema } from '@backstage/plugin-scaffolder-react';
 
 /**
  * Field validation type for Custom Field Extensions.

plugins/scaffolder-react/src/next/components/Form/Form.tsx

@@ -20,7 +20,7 @@ import { PropsWithChildren } from 'react';
 import { FieldTemplate } from './FieldTemplate';
 import { DescriptionFieldTemplate } from './DescriptionFieldTemplate';
 import { FieldProps } from '@rjsf/utils';
-import { ScaffolderRJSFFormProps } from '../../../extensions';
+import { ScaffolderRJSFFormProps } from '@backstage/plugin-scaffolder-react';
 
 // TODO(blam): We require here, as the types in this package depend on @rjsf/core explicitly
 // which is what we're using here as the default types, it needs to depend on @rjsf/core-v5 because

plugins/scaffolder-react/src/next/components/Stepper/createAsyncValidators.ts

@@ -22,12 +22,10 @@ import { createFieldValidation, extractSchemaFromStep } from '../../lib';
 import {
   CustomFieldValidator,
   FieldExtensionUiSchema,
-} from '../../../extensions';
+} from '@backstage/plugin-scaffolder-react';
 import { isObject } from './utils';
 
-/**
- * @internal
- */
+/** @alpha */
 export type FormValidation = {
   [name: string]: FieldValidation | FormValidation;
 };

plugins/scaffolder-react/src/next/components/Stepper/index.ts

@@ -14,4 +14,7 @@
  * limitations under the License.
  */
 export { Stepper, type StepperProps } from './Stepper';
-export { createAsyncValidators } from './createAsyncValidators';
+export {
+  createAsyncValidators,
+  type FormValidation,
+} from './createAsyncValidators';

plugins/scaffolder-react/src/next/components/TemplateGroups/TemplateGroups.tsx

@@ -23,7 +23,7 @@ import {
 import { Progress, Link } from '@backstage/core-components';
 import { Typography } from '@material-ui/core';
 import { errorApiRef, IconComponent, useApi } from '@backstage/core-plugin-api';
-import { TemplateGroupFilter } from '../../../components';
+import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react';
 import { TemplateGroup } from '../TemplateGroup/TemplateGroup';
 
 /**

plugins/scaffolder-react/src/next/components/Workflow/Workflow.tsx

@@ -27,7 +27,7 @@ import { errorApiRef, useApi } from '@backstage/core-plugin-api';
 import { useTemplateParameterSchema } from '../../hooks/useTemplateParameterSchema';
 import { Stepper, type StepperProps } from '../Stepper/Stepper';
 import { SecretsContextProvider } from '../../../secrets/SecretsContext';
-import { ReviewStepProps } from '../../../components';
+import { ReviewStepProps } from '@backstage/plugin-scaffolder-react';
 
 const useStyles = makeStyles<BackstageTheme>(() => ({
   markdown: {