From 016b2238b267c964bed66fb69dad435fbe276940 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 23 Dec 2022 14:41:28 +0100
Subject: [PATCH] chore: revert exporting the next stuff for now as it's not
 gonna work with the repo setup Signed-off-by: blam <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 packages/app/package.json                     |  1 +
 .../scaffolder/customScaffolderExtensions.tsx | 10 +--
 plugins/scaffolder/src/index.ts               | 68 +------------------
 3 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index 553754a15d..86e0402d7d 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -49,6 +49,7 @@
     "@backstage/plugin-playlist": "workspace:^",
     "@backstage/plugin-rollbar": "workspace:^",
     "@backstage/plugin-scaffolder": "workspace:^",
+    "@backstage/plugin-scaffolder-react": "workspace:^",
     "@backstage/plugin-search": "workspace:^",
     "@backstage/plugin-search-common": "workspace:^",
     "@backstage/plugin-search-react": "workspace:^",
diff --git a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
index 3265d347a2..c521bcf86c 100644
--- a/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
+++ b/packages/app/src/components/scaffolder/customScaffolderExtensions.tsx
@@ -15,15 +15,15 @@
  */
 import React from 'react';
 import type { FieldValidation } from '@rjsf/utils';
+import { scaffolderPlugin } from '@backstage/plugin-scaffolder';
+import { TextField } from '@material-ui/core';
+
 import {
+  NextFieldExtensionComponentProps,
   createNextScaffolderFieldExtension,
   createScaffolderFieldExtension,
   FieldExtensionComponentProps,
-  NextFieldExtensionComponentProps,
-  scaffolderPlugin,
-} from '@backstage/plugin-scaffolder';
-
-import { TextField } from '@material-ui/core';
+} from '@backstage/plugin-scaffolder-react';
 
 const TextValuePicker = (props: FieldExtensionComponentProps<string>) => {
   const {
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
index 28064721c5..a23324646f 100644
--- a/plugins/scaffolder/src/index.ts
+++ b/plugins/scaffolder/src/index.ts
@@ -57,6 +57,8 @@ export {
   ScaffolderFieldExtensions,
   rootRouteRef,
   selectedTemplateRouteRef,
+  useTemplateSecrets,
+  type ScaffolderUseTemplateSecrets,
   type TemplateParameterSchema,
   type CustomFieldExtensionSchema,
   type CustomFieldValidator,
@@ -71,69 +73,3 @@ export type { TaskPageProps } from './components/TaskPage';
 export { NextScaffolderPage } from './plugin';
 export type { NextRouterProps } from './next';
 export type { TemplateGroupFilter } from './next';
-
-// These types in the future can be removed from being exported out of this package and be imported
-// instead from @backstage/plugin-scaffolder-react. They have to be redeclared here to keep the alpha
-// annotation in order to not polluted the main export surface.
-import {
-  nextRouteRef as nextRouteRefTemp,
-  nextSelectedTemplateRouteRef as nextSelectedTemplateRouteRefTemp,
-  createNextScaffolderFieldExtension as createNextScaffolderFieldExtensionTemp,
-  type NextCustomFieldValidator as NextCustomFieldValidatorTemp,
-  type NextFieldExtensionOptions as NextFieldExtensionOptionsTemp,
-  type NextFieldExtensionComponentProps as NextFieldExtensionComponentPropsTemp,
-  type FormProps as FormPropsTemp,
-} from '@backstage/plugin-scaffolder-react';
-
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-const nextRouteRef = nextRouteRefTemp;
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-const nextSelectedTemplateRouteRef = nextSelectedTemplateRouteRefTemp;
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-const createNextScaffolderFieldExtension =
-  createNextScaffolderFieldExtensionTemp;
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-type NextCustomFieldValidator<T> = NextCustomFieldValidatorTemp<T>;
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-type NextFieldExtensionOptions<
-  TFieldReturnValue = unknown,
-  TInputProps = unknown,
-> = NextFieldExtensionOptionsTemp<TFieldReturnValue, TInputProps>;
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-type NextFieldExtensionComponentProps<
-  TFieldReturnValue,
-  TUiOptions = {},
-> = NextFieldExtensionComponentPropsTemp<TFieldReturnValue, TUiOptions>;
-/**
- * @alpha
- * @deprecated Please import from `@backstage/plugin-scaffolder-react` instead
- */
-type FormProps = FormPropsTemp;
-
-export {
-  nextRouteRef,
-  nextSelectedTemplateRouteRef,
-  createNextScaffolderFieldExtension,
-  type NextCustomFieldValidator,
-  type NextFieldExtensionOptions,
-  type NextFieldExtensionComponentProps,
-  type FormProps,
-};