From 3cf1950a3f8bdffac6e44cff59636b8145d66871 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Sat, 28 Mar 2026 14:03:00 +0100
Subject: [PATCH] plugin-catalog-import: move NFS page export to alpha entry
 point

Move NfsDefaultImportPage out of the public API and export it as
DefaultImportPage from the alpha entry point instead.

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
Made-with: Cursor
---
 plugins/catalog-import/report-alpha.api.md           | 12 ++++++++----
 plugins/catalog-import/report.api.md                 |  3 ---
 plugins/catalog-import/src/alpha.tsx                 |  4 +++-
 .../DefaultImportPage/DefaultImportPage.tsx          |  2 +-
 .../src/components/DefaultImportPage/index.ts        |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md
index d00d4634a2..b4847f06f1 100644
--- a/plugins/catalog-import/report-alpha.api.md
+++ b/plugins/catalog-import/report-alpha.api.md
@@ -11,7 +11,8 @@ import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api';
 import { ExtensionDataRef } from '@backstage/frontend-plugin-api';
 import { ExtensionInput } from '@backstage/frontend-plugin-api';
 import { IconElement } from '@backstage/frontend-plugin-api';
-import { JSX as JSX_2 } from 'react';
+import { JSX as JSX_2 } from 'react/jsx-runtime';
+import { JSX as JSX_3 } from 'react';
 import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api';
 import { RouteRef } from '@backstage/core-plugin-api';
@@ -133,7 +134,7 @@ const _default: OverridableFrontendPlugin<
               optional: true;
             }
           >
-        | ExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
+        | ExtensionDataRef<JSX_3.Element, 'core.reactElement', {}>
         | ExtensionDataRef<
             string,
             'core.title',
@@ -150,7 +151,7 @@ const _default: OverridableFrontendPlugin<
           >;
       inputs: {
         pages: ExtensionInput<
-          | ConfigurableExtensionDataRef<JSX_2.Element, 'core.reactElement', {}>
+          | ConfigurableExtensionDataRef<JSX_3.Element, 'core.reactElement', {}>
           | ConfigurableExtensionDataRef<string, 'core.routing.path', {}>
           | ConfigurableExtensionDataRef<
               RouteRef_2<AnyRouteRefParams>,
@@ -184,7 +185,7 @@ const _default: OverridableFrontendPlugin<
         path: string;
         title?: string;
         icon?: IconElement;
-        loader?: () => Promise<JSX_2.Element>;
+        loader?: () => Promise<JSX_3.Element>;
         routeRef?: RouteRef_2;
         noHeader?: boolean;
       };
@@ -193,5 +194,8 @@ const _default: OverridableFrontendPlugin<
 >;
 export default _default;
 
+// @alpha (undocumented)
+export const DefaultImportPage: () => JSX_2.Element;
+
 // (No @packageDocumentation comment for this package)
 ```
diff --git a/plugins/catalog-import/report.api.md b/plugins/catalog-import/report.api.md
index 14c8bbc1f1..7eff3a7a9c 100644
--- a/plugins/catalog-import/report.api.md
+++ b/plugins/catalog-import/report.api.md
@@ -298,9 +298,6 @@ export interface ImportStepperProps {
   variant?: InfoCardVariants;
 }
 
-// @public (undocumented)
-export const NfsDefaultImportPage: () => JSX_2.Element;
-
 // @public
 export const PreparePullRequestForm: <TFieldValues extends Record<string, any>>(
   props: PreparePullRequestFormProps<TFieldValues>,
diff --git a/plugins/catalog-import/src/alpha.tsx b/plugins/catalog-import/src/alpha.tsx
index af076e8317..52b7f9cfe1 100644
--- a/plugins/catalog-import/src/alpha.tsx
+++ b/plugins/catalog-import/src/alpha.tsx
@@ -44,6 +44,8 @@ import { catalogImportTranslationRef as _catalogImportTranslationRef } from './t
  */
 export const catalogImportTranslationRef = _catalogImportTranslationRef;
 
+export { NfsDefaultImportPage as DefaultImportPage } from './components/DefaultImportPage/DefaultImportPage';
+
 // TODO: It's currently possible to override the import page with a custom one. We need to decide
 //       whether this type of override is typically done with an input or by overriding the entire extension.
 const catalogImportPage = PageBlueprint.make({
@@ -51,7 +53,7 @@ const catalogImportPage = PageBlueprint.make({
     path: '/catalog-import',
     routeRef: rootRouteRef,
     loader: () =>
-      import('./components/DefaultImportPage').then(m => (
+      import('./components/DefaultImportPage/DefaultImportPage').then(m => (
         <RequirePermission permission={catalogEntityCreatePermission}>
           <m.NfsDefaultImportPage />
         </RequirePermission>
diff --git a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
index b34ed7d640..5861a141e3 100644
--- a/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
+++ b/plugins/catalog-import/src/components/DefaultImportPage/DefaultImportPage.tsx
@@ -82,7 +82,7 @@ export const DefaultImportPage = () => {
 };
 
 /**
- * @public
+ * @alpha
  */
 export const NfsDefaultImportPage = () => {
   const { t } = useTranslationRef(catalogImportTranslationRef);
diff --git a/plugins/catalog-import/src/components/DefaultImportPage/index.ts b/plugins/catalog-import/src/components/DefaultImportPage/index.ts
index 590d032c9b..5a4d4907e3 100644
--- a/plugins/catalog-import/src/components/DefaultImportPage/index.ts
+++ b/plugins/catalog-import/src/components/DefaultImportPage/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { DefaultImportPage, NfsDefaultImportPage } from './DefaultImportPage';
+export { DefaultImportPage } from './DefaultImportPage';