chore: moved implementations to app pliugin

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

packages/app-next/src/examples/notFoundErrorPageExtension.tsx

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import { AdaptableComponentBlueprint } from '@backstage/frontend-plugin-api';
+import {
+  AdaptableComponentBlueprint,
+  NotFoundErrorPage,
+} from '@backstage/frontend-plugin-api';
 import Box from '@material-ui/core/Box';
 import Typography from '@material-ui/core/Typography';
 import { Button } from '@backstage/core-components';
-import { NotFoundErrorPage } from '@backstage/plugin-app';
 
 export function CustomNotFoundErrorPage() {
   return (

packages/core-compat-api/src/compatWrapper/ForwardsCompatProvider.tsx

@@ -35,7 +35,6 @@ import {
   RouteResolutionApi,
   SubRouteRef,
   componentsApiRef,
-  coreComponentRefs,
   iconsApiRef,
   routeResolutionApiRef,
 } from '@backstage/frontend-plugin-api';

packages/core-compat-api/src/convertLegacyAppOptions.tsx

@@ -38,11 +38,11 @@ import {
 } from '@backstage/core-plugin-api';
 import { toLegacyPlugin } from './compatWrapper/BackwardsCompatProvider';
 import { compatWrapper } from './compatWrapper';
-import { Progress as AdaptableProgress } from '@backstage/core-components';
 import {
-  NotFoundErrorPage as AdaptableNotFoundErrorPage,
   ErrorBoundary as AdaptableErrorBoundary,
-} from '@backstage/plugin-app';
+  NotFoundErrorPage as AdaptableNotFoundErrorPage,
+  Progress as AdaptableProgress,
+} from '@backstage/frontend-plugin-api';
 
 function componentCompatWrapper<TProps extends {}>(
   Component: ComponentType<TProps>,
@@ -167,6 +167,7 @@ export function convertLegacyAppOptions(
         }),
       );
     }
+
     if (NotFoundErrorPage) {
       extensions.push(
         AdaptableComponentBlueprint.make({

packages/core-components/src/components/Progress/Progress.tsx

@@ -21,10 +21,7 @@ import LinearProgress, {
 import { useTheme } from '@material-ui/core/styles';
 import { PropsWithChildren, useEffect, useState } from 'react';
 
-// eslint-disable-next-line @backstage/no-relative-monorepo-imports
-import { createAdaptableComponent } from '../../../../frontend-plugin-api/src/components/createAdaptableComponent';
-
-function ProgressComponent(props: PropsWithChildren<LinearProgressProps>) {
+export function Progress(props: PropsWithChildren<LinearProgressProps>) {
   const theme = useTheme();
   const [isVisible, setIsVisible] = useState(false);
 
@@ -42,8 +39,3 @@ function ProgressComponent(props: PropsWithChildren<LinearProgressProps>) {
     <Box display="none" data-testid="progress" />
   );
 }
-
-export const Progress = createAdaptableComponent({
-  id: 'core.components.progress',
-  loader: () => ProgressComponent,
-});

packages/frontend-plugin-api/src/blueprints/AdaptableComponentBlueprint.test.tsx

@@ -54,7 +54,7 @@ describe('AdaptableComponentBlueprint', () => {
           params: define =>
             define({
               // todo(blam): there's a bug that this path cannot be `/`?
-              defaultPath: '/test',
+              path: '/test',
               loader: async () => <TestComponent hello="test!" />,
             }),
         }),
@@ -75,7 +75,7 @@ describe('AdaptableComponentBlueprint', () => {
         PageBlueprint.make({
           params: define =>
             define({
-              defaultPath: '/test',
+              path: '/test',
               loader: async () => <TestComponent />,
             }),
         }),
@@ -101,7 +101,7 @@ describe('AdaptableComponentBlueprint', () => {
           params: define =>
             define({
               // todo(blam): there's a bug that this path cannot be `/`?
-              defaultPath: '/test',
+              path: '/test',
               loader: async () => <TestComponent hello="test!" />,
             }),
         }),
@@ -132,7 +132,7 @@ describe('AdaptableComponentBlueprint', () => {
         PageBlueprint.make({
           params: define =>
             define({
-              defaultPath: '/test',
+              path: '/test',
               loader: async () => <TestComponent hello="test!" />,
             }),
         }),

packages/frontend-plugin-api/src/components/DefaultAdaptableComponents.ts

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 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.
+ */
+import { createAdaptableComponent } from '@backstage/frontend-plugin-api';
+
+export const Progress = createAdaptableComponent({
+  id: 'core.components.progress',
+});
+
+export const NotFoundErrorPage = createAdaptableComponent({
+  id: 'core.components.notFoundErrorPage',
+});
+
+export const ErrorBoundary = createAdaptableComponent({
+  id: 'core.components.errorBoundary',
+});

packages/frontend-plugin-api/src/components/index.ts

@@ -23,3 +23,4 @@ export {
   type ComponentRef,
 } from './createAdaptableComponent';
 export { useAppNode } from './AppNodeProvider';
+export * from './DefaultAdaptableComponents';

plugins/app/src/extensions/AppRoutes.tsx

@@ -18,9 +18,9 @@ import {
   createExtension,
   coreExtensionData,
   createExtensionInput,
+  NotFoundErrorPage,
 } from '@backstage/frontend-plugin-api';
 import { useRoutes } from 'react-router-dom';
-import { NotFoundErrorPage } from './components';
 
 export const AppRoutes = createExtension({
   name: 'routes',

plugins/app/src/extensions/components.tsx

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Backstage Authors
+ * Copyright 2025 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.
@@ -13,15 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import {
+  NotFoundErrorPage as AdaptableNotFoundErrorPage,
+  Progress as AdaptableProgress,
+  ErrorBoundary as AdaptableErrorBoundary,
+  AdaptableComponentBlueprint,
+} from '@backstage/frontend-plugin-api';
 
-import { createAdaptableComponent } from '@backstage/frontend-plugin-api';
+import { Progress as ProgressComponent } from '@backstage/core-components';
 
-export const NotFoundErrorPage = createAdaptableComponent({
-  id: 'core.components.notFoundErrorPage',
-  // todo: implementation
+export const Progress = AdaptableComponentBlueprint.make({
+  name: 'core.components.progress',
+  params: define =>
+    define({
+      component: AdaptableProgress,
+      loader: () => ProgressComponent,
+    }),
 });
 
-export const ErrorBoundary = createAdaptableComponent({
-  id: 'core.components.errorBoundaryFallback',
-  // todo: implementation
+export const NotFoundErrorPage = AdaptableComponentBlueprint.make({
+  name: 'core.components.notFoundErrorPage',
+  params: define =>
+    define({
+      component: AdaptableNotFoundErrorPage,
+      loader: () => NotFoundErrorPageComponent,
+    }),
+});
+
+export const ErrorBoundary = AdaptableComponentBlueprint.make({
+  name: 'core.components.errorBoundary',
+  params: define =>
+    define({
+      component: AdaptableErrorBoundary,
+      loader: () => ErrorBoundaryComponent,
+    }),
 });

plugins/app/src/extensions/index.ts

@@ -26,9 +26,8 @@ export { FeatureFlagsApi } from './FeatureFlagsApi';
 export { TranslationsApi } from './TranslationsApi';
 export { DefaultSignInPage } from './DefaultSignInPage';
 export { dialogDisplayAppRootElement } from './DialogDisplay';
-// todo: move these
-export { ErrorBoundary, NotFoundErrorPage } from './components';
 export {
   oauthRequestDialogAppRootElement,
   alertDisplayAppRootElement,
 } from './elements';
+export { Progress, NotFoundErrorPage, ErrorBoundary } from './components';

plugins/app/src/index.ts

@@ -15,5 +15,3 @@
  */
 
 export { appPlugin as default } from './plugin';
-// todo: remove
-export * from './extensions/components';

plugins/app/src/plugin.ts

@@ -33,6 +33,9 @@ import {
   alertDisplayAppRootElement,
   DefaultSignInPage,
   dialogDisplayAppRootElement,
+  Progress,
+  NotFoundErrorPage,
+  ErrorBoundary,
 } from './extensions';
 import { apis } from './defaultApis';
 
@@ -59,5 +62,8 @@ export const appPlugin = createFrontendPlugin({
     oauthRequestDialogAppRootElement,
     alertDisplayAppRootElement,
     dialogDisplayAppRootElement,
+    Progress,
+    NotFoundErrorPage,
+    ErrorBoundary,
   ],
 });