diff --git a/.changeset/metal-humans-lose.md b/.changeset/metal-humans-lose.md index 490ae28ab2..f96d33a779 100644 --- a/.changeset/metal-humans-lose.md +++ b/.changeset/metal-humans-lose.md @@ -18,4 +18,4 @@ '@backstage/plugin-org': patch --- -Remove unnecessary use of `compatWrapper` for the new frontend system. +Remove unnecessary use of `compatWrapper` and `convertLegacyRouteRef`(s) for the new frontend system. diff --git a/plugins/api-docs/report-alpha.api.md b/plugins/api-docs/report-alpha.api.md index e969afd777..3e8b0153d8 100644 --- a/plugins/api-docs/report-alpha.api.md +++ b/plugins/api-docs/report-alpha.api.md @@ -13,12 +13,13 @@ import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha'; import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; -import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; +import { ExternalRouteRef } from '@backstage/core-plugin-api'; import { IconComponent } from '@backstage/frontend-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { TranslationRef } from '@backstage/frontend-plugin-api'; // @alpha (undocumented) @@ -63,7 +64,7 @@ const _default: OverridableFrontendPlugin< root: RouteRef; }, { - registerApi: ExternalRouteRef; + registerApi: ExternalRouteRef; }, { 'api:api-docs/config': OverridableExtensionDefinition<{ @@ -346,7 +347,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -383,7 +384,7 @@ const _default: OverridableFrontendPlugin< defaultGroup?: [Error: `Use the 'group' param instead`]; group?: keyof defaultEntityContentGroups | (string & {}); loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; filter?: string | EntityPredicate | ((entity: Entity) => boolean); }; }>; @@ -406,7 +407,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -443,7 +444,7 @@ const _default: OverridableFrontendPlugin< defaultGroup?: [Error: `Use the 'group' param instead`]; group?: keyof defaultEntityContentGroups | (string & {}); loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; filter?: string | EntityPredicate | ((entity: Entity) => boolean); }; }>; @@ -456,7 +457,7 @@ const _default: OverridableFrontendPlugin< { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }, 'core.nav-item.target', {} @@ -465,7 +466,7 @@ const _default: OverridableFrontendPlugin< params: { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }; }>; 'page:api-docs': OverridableExtensionDefinition<{ @@ -483,7 +484,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -504,7 +505,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/api-docs/src/alpha.tsx b/plugins/api-docs/src/alpha.tsx index 87dccdf713..73b1c008ab 100644 --- a/plugins/api-docs/src/alpha.tsx +++ b/plugins/api-docs/src/alpha.tsx @@ -23,8 +23,6 @@ import { createFrontendPlugin, } from '@backstage/frontend-plugin-api'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; - import { ApiEntity, parseEntityRef, @@ -44,7 +42,7 @@ import { const apiDocsNavItem = NavItemBlueprint.make({ params: { title: 'APIs', - routeRef: convertLegacyRouteRef(rootRoute), + routeRef: rootRoute, icon: () => , }, }); @@ -77,7 +75,7 @@ const apiDocsExplorerPage = PageBlueprint.makeWithOverrides({ factory(originalFactory, { config }) { return originalFactory({ path: '/api-docs', - routeRef: convertLegacyRouteRef(rootRoute), + routeRef: rootRoute, loader: () => import('./components/ApiExplorerPage').then(m => ( import('../package.json') }, routes: { - root: convertLegacyRouteRef(rootRoute), + root: rootRoute, }, externalRoutes: { - registerApi: convertLegacyRouteRef(registerComponentRouteRef), + registerApi: registerComponentRouteRef, }, extensions: [ apiDocsNavItem, diff --git a/plugins/catalog-graph/report-alpha.api.md b/plugins/catalog-graph/report-alpha.api.md index 285b8b3119..2f5c713ee8 100644 --- a/plugins/catalog-graph/report-alpha.api.md +++ b/plugins/catalog-graph/report-alpha.api.md @@ -12,11 +12,12 @@ import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha'; import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; -import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; +import { ExternalRouteRef } from '@backstage/core-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { TranslationRef } from '@backstage/frontend-plugin-api'; // @alpha (undocumented) @@ -53,11 +54,14 @@ const _default: OverridableFrontendPlugin< catalogGraph: RouteRef; }, { - catalogEntity: ExternalRouteRef<{ - name: string; - kind: string; - namespace: string; - }>; + catalogEntity: ExternalRouteRef< + { + name: string; + kind: string; + namespace: string; + }, + true + >; }, { 'api:catalog-graph': OverridableExtensionDefinition<{ @@ -187,7 +191,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -208,7 +212,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/catalog-graph/src/alpha.tsx b/plugins/catalog-graph/src/alpha.tsx index bd9726513b..a2a8c7eb5e 100644 --- a/plugins/catalog-graph/src/alpha.tsx +++ b/plugins/catalog-graph/src/alpha.tsx @@ -19,7 +19,6 @@ import { createFrontendPlugin, PageBlueprint, } from '@backstage/frontend-plugin-api'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import { EntityCardBlueprint } from '@backstage/plugin-catalog-react/alpha'; import { catalogGraphRouteRef, catalogEntityRouteRef } from './routes'; import { @@ -78,7 +77,7 @@ const CatalogGraphPage = PageBlueprint.makeWithOverrides({ factory(originalFactory, { config }) { return originalFactory({ path: '/catalog-graph', - routeRef: convertLegacyRouteRef(catalogGraphRouteRef), + routeRef: catalogGraphRouteRef, loader: () => import('./components/CatalogGraphPage').then(m => ( @@ -100,10 +99,10 @@ export default createFrontendPlugin({ pluginId: 'catalog-graph', info: { packageJson: () => import('../package.json') }, routes: { - catalogGraph: convertLegacyRouteRef(catalogGraphRouteRef), + catalogGraph: catalogGraphRouteRef, }, externalRoutes: { - catalogEntity: convertLegacyRouteRef(catalogEntityRouteRef), + catalogEntity: catalogEntityRouteRef, }, extensions: [CatalogGraphPage, CatalogGraphEntityCard, CatalogGraphApi], }); diff --git a/plugins/catalog-import/report-alpha.api.md b/plugins/catalog-import/report-alpha.api.md index 5dfa90388a..a718145b24 100644 --- a/plugins/catalog-import/report-alpha.api.md +++ b/plugins/catalog-import/report-alpha.api.md @@ -11,7 +11,8 @@ import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { TranslationRef } from '@backstage/core-plugin-api/alpha'; // @alpha (undocumented) @@ -122,7 +123,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -133,7 +134,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/catalog-import/src/alpha.tsx b/plugins/catalog-import/src/alpha.tsx index 42caa06f42..a00eb39988 100644 --- a/plugins/catalog-import/src/alpha.tsx +++ b/plugins/catalog-import/src/alpha.tsx @@ -19,7 +19,6 @@ import { discoveryApiRef, fetchApiRef, } from '@backstage/core-plugin-api'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import { createFrontendPlugin, PageBlueprint, @@ -42,7 +41,7 @@ export * from './translation'; const catalogImportPage = PageBlueprint.make({ params: { path: '/catalog-import', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: () => import('./components/ImportPage').then(m => ( @@ -89,7 +88,7 @@ export default createFrontendPlugin({ info: { packageJson: () => import('../package.json') }, extensions: [catalogImportApi, catalogImportPage], routes: { - importPage: convertLegacyRouteRef(rootRouteRef), + importPage: rootRouteRef, }, }); diff --git a/plugins/catalog-unprocessed-entities/report-alpha.api.md b/plugins/catalog-unprocessed-entities/report-alpha.api.md index 96827c78f6..50bc0c22fa 100644 --- a/plugins/catalog-unprocessed-entities/report-alpha.api.md +++ b/plugins/catalog-unprocessed-entities/report-alpha.api.md @@ -12,7 +12,8 @@ import { IconComponent } from '@backstage/frontend-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; // @alpha (undocumented) const _default: OverridableFrontendPlugin< @@ -45,7 +46,7 @@ const _default: OverridableFrontendPlugin< { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }, 'core.nav-item.target', {} @@ -54,7 +55,7 @@ const _default: OverridableFrontendPlugin< params: { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }; }>; 'page:catalog-unprocessed-entities': OverridableExtensionDefinition<{ @@ -70,7 +71,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -81,7 +82,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/catalog-unprocessed-entities/src/alpha/plugin.tsx b/plugins/catalog-unprocessed-entities/src/alpha/plugin.tsx index 2b39f941fa..5ccae907aa 100644 --- a/plugins/catalog-unprocessed-entities/src/alpha/plugin.tsx +++ b/plugins/catalog-unprocessed-entities/src/alpha/plugin.tsx @@ -27,7 +27,6 @@ import { catalogUnprocessedEntitiesApiRef, CatalogUnprocessedEntitiesClient, } from '../api'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import QueueIcon from '@material-ui/icons/Queue'; import { rootRouteRef } from '../routes'; @@ -49,7 +48,7 @@ export const catalogUnprocessedEntitiesApi = ApiBlueprint.make({ export const catalogUnprocessedEntitiesPage = PageBlueprint.make({ params: { path: '/catalog-unprocessed-entities', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: () => import('../components/UnprocessedEntities').then(m => ( @@ -61,7 +60,7 @@ export const catalogUnprocessedEntitiesPage = PageBlueprint.make({ export const catalogUnprocessedEntitiesNavItem = NavItemBlueprint.make({ params: { title: 'Unprocessed Entities', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, icon: QueueIcon, }, }); @@ -71,7 +70,7 @@ export default createFrontendPlugin({ pluginId: 'catalog-unprocessed-entities', info: { packageJson: () => import('../../package.json') }, routes: { - root: convertLegacyRouteRef(rootRouteRef), + root: rootRouteRef, }, extensions: [ catalogUnprocessedEntitiesApi, diff --git a/plugins/catalog/report-alpha.api.md b/plugins/catalog/report-alpha.api.md index abf66113c7..e40444bd07 100644 --- a/plugins/catalog/report-alpha.api.md +++ b/plugins/catalog/report-alpha.api.md @@ -16,13 +16,14 @@ import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha'; import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; -import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; +import { ExternalRouteRef } from '@backstage/core-plugin-api'; import { IconComponent } from '@backstage/frontend-plugin-api'; import { IconLinkVerticalProps } from '@backstage/core-components'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { SearchResultItemExtensionComponent } from '@backstage/plugin-search-react/alpha'; import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-react/alpha'; import { SearchResultListItemBlueprintParams } from '@backstage/plugin-search-react/alpha'; @@ -124,17 +125,23 @@ const _default: OverridableFrontendPlugin< }>; }, { - viewTechDoc: ExternalRouteRef<{ - name: string; - kind: string; - namespace: string; - }>; - createComponent: ExternalRouteRef; - createFromTemplate: ExternalRouteRef<{ - namespace: string; - templateName: string; - }>; - unregisterRedirect: ExternalRouteRef; + viewTechDoc: ExternalRouteRef< + { + name: string; + kind: string; + namespace: string; + }, + true + >; + createComponent: ExternalRouteRef; + createFromTemplate: ExternalRouteRef< + { + namespace: string; + templateName: string; + }, + true + >; + unregisterRedirect: ExternalRouteRef; }, { 'api:catalog': OverridableExtensionDefinition<{ @@ -759,7 +766,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -852,7 +859,7 @@ const _default: OverridableFrontendPlugin< defaultGroup?: [Error: `Use the 'group' param instead`]; group?: keyof defaultEntityContentGroups | (string & {}); loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; filter?: string | EntityPredicate | ((entity: Entity) => boolean); }; }>; @@ -967,7 +974,7 @@ const _default: OverridableFrontendPlugin< { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }, 'core.nav-item.target', {} @@ -976,7 +983,7 @@ const _default: OverridableFrontendPlugin< params: { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }; }>; 'page:catalog': OverridableExtensionDefinition<{ @@ -1007,7 +1014,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -1028,7 +1035,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; 'page:catalog/entity': OverridableExtensionDefinition<{ @@ -1060,7 +1067,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -1091,7 +1098,7 @@ const _default: OverridableFrontendPlugin< | ConfigurableExtensionDataRef | ConfigurableExtensionDataRef | ConfigurableExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -1149,7 +1156,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; 'search-result-list-item:catalog': OverridableExtensionDefinition<{ diff --git a/plugins/catalog/src/alpha/navItems.tsx b/plugins/catalog/src/alpha/navItems.tsx index 0eb4e6827e..e72c20ebf4 100644 --- a/plugins/catalog/src/alpha/navItems.tsx +++ b/plugins/catalog/src/alpha/navItems.tsx @@ -15,13 +15,12 @@ */ import HomeIcon from '@material-ui/icons/Home'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import { NavItemBlueprint } from '@backstage/frontend-plugin-api'; import { rootRouteRef } from '../routes'; export const catalogNavItem = NavItemBlueprint.make({ params: { - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, title: 'Catalog', icon: HomeIcon, }, diff --git a/plugins/catalog/src/alpha/pages.tsx b/plugins/catalog/src/alpha/pages.tsx index 616e6f3a29..b9b8f9ba1f 100644 --- a/plugins/catalog/src/alpha/pages.tsx +++ b/plugins/catalog/src/alpha/pages.tsx @@ -56,7 +56,7 @@ export const catalogPage = PageBlueprint.makeWithOverrides({ factory(originalFactory, { inputs, config }) { return originalFactory({ path: '/catalog', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: async () => { const { BaseCatalogPage } = await import('../components/CatalogPage'); const filters = inputs.filters.map(filter => diff --git a/plugins/catalog/src/alpha/plugin.tsx b/plugins/catalog/src/alpha/plugin.tsx index ff26d20003..44cf2101b6 100644 --- a/plugins/catalog/src/alpha/plugin.tsx +++ b/plugins/catalog/src/alpha/plugin.tsx @@ -14,7 +14,6 @@ * limitations under the License. */ -import { convertLegacyRouteRefs } from '@backstage/core-compat-api'; import { createFrontendPlugin } from '@backstage/frontend-plugin-api'; import { entityRouteRef } from '@backstage/plugin-catalog-react'; @@ -41,16 +40,16 @@ import contextMenuItems from './contextMenuItems'; export default createFrontendPlugin({ pluginId: 'catalog', info: { packageJson: () => import('../../package.json') }, - routes: convertLegacyRouteRefs({ + routes: { catalogIndex: rootRouteRef, catalogEntity: entityRouteRef, - }), - externalRoutes: convertLegacyRouteRefs({ + }, + externalRoutes: { viewTechDoc: viewTechDocRouteRef, createComponent: createComponentRouteRef, createFromTemplate: createFromTemplateRouteRef, unregisterRedirect: unregisterRedirectRouteRef, - }), + }, extensions: [ ...apis, ...pages, diff --git a/plugins/devtools/report-alpha.api.md b/plugins/devtools/report-alpha.api.md index c9a538be0b..9640158e53 100644 --- a/plugins/devtools/report-alpha.api.md +++ b/plugins/devtools/report-alpha.api.md @@ -12,7 +12,8 @@ import { IconComponent } from '@backstage/frontend-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; // @alpha (undocumented) const _default: OverridableFrontendPlugin< @@ -45,7 +46,7 @@ const _default: OverridableFrontendPlugin< { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }, 'core.nav-item.target', {} @@ -54,7 +55,7 @@ const _default: OverridableFrontendPlugin< params: { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }; }>; 'page:devtools': OverridableExtensionDefinition<{ @@ -70,7 +71,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -81,7 +82,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/devtools/src/alpha/plugin.tsx b/plugins/devtools/src/alpha/plugin.tsx index a331a53243..85021e9857 100644 --- a/plugins/devtools/src/alpha/plugin.tsx +++ b/plugins/devtools/src/alpha/plugin.tsx @@ -24,7 +24,6 @@ import { } from '@backstage/frontend-plugin-api'; import { devToolsApiRef, DevToolsClient } from '../api'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import BuildIcon from '@material-ui/icons/Build'; import { rootRouteRef } from '../routes'; @@ -46,7 +45,7 @@ export const devToolsApi = ApiBlueprint.make({ export const devToolsPage = PageBlueprint.make({ params: { path: '/devtools', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: () => import('../components/DevToolsPage').then(m => ), }, @@ -56,7 +55,7 @@ export const devToolsPage = PageBlueprint.make({ export const devToolsNavItem = NavItemBlueprint.make({ params: { title: 'DevTools', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, icon: BuildIcon, }, }); @@ -66,7 +65,7 @@ export default createFrontendPlugin({ pluginId: 'devtools', info: { packageJson: () => import('../../package.json') }, routes: { - root: convertLegacyRouteRef(rootRouteRef), + root: rootRouteRef, }, extensions: [devToolsApi, devToolsPage, devToolsNavItem], }); diff --git a/plugins/kubernetes/report-alpha.api.md b/plugins/kubernetes/report-alpha.api.md index 571e09d546..2872ab89e4 100644 --- a/plugins/kubernetes/report-alpha.api.md +++ b/plugins/kubernetes/report-alpha.api.md @@ -14,7 +14,8 @@ import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { TranslationRef } from '@backstage/core-plugin-api/alpha'; // @public (undocumented) @@ -103,7 +104,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -140,7 +141,7 @@ const _default: OverridableFrontendPlugin< defaultGroup?: [Error: `Use the 'group' param instead`]; group?: keyof defaultEntityContentGroups | (string & {}); loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; filter?: string | EntityPredicate | ((entity: Entity) => boolean); }; }>; @@ -157,7 +158,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -168,7 +169,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/kubernetes/src/alpha/pages.tsx b/plugins/kubernetes/src/alpha/pages.tsx index 23e78f9264..3069d25cd6 100644 --- a/plugins/kubernetes/src/alpha/pages.tsx +++ b/plugins/kubernetes/src/alpha/pages.tsx @@ -15,16 +15,12 @@ */ import { PageBlueprint } from '@backstage/frontend-plugin-api'; -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import { rootCatalogKubernetesRouteRef } from '../plugin'; export const kubernetesPage = PageBlueprint.make({ params: { path: '/kubernetes', - // you can reuse the existing routeRef - // by wrapping into the convertLegacyRouteRef. - routeRef: convertLegacyRouteRef(rootCatalogKubernetesRouteRef), - // these inputs usually match the props required by the component. + routeRef: rootCatalogKubernetesRouteRef, loader: () => import('../Router').then(m => ), }, }); diff --git a/plugins/kubernetes/src/alpha/plugin.tsx b/plugins/kubernetes/src/alpha/plugin.tsx index db7b2439bf..fdca467886 100644 --- a/plugins/kubernetes/src/alpha/plugin.tsx +++ b/plugins/kubernetes/src/alpha/plugin.tsx @@ -14,7 +14,6 @@ * limitations under the License. */ -import { convertLegacyRouteRefs } from '@backstage/core-compat-api'; import { createFrontendPlugin } from '@backstage/frontend-plugin-api'; import { kubernetesPage } from './pages'; import { entityKubernetesContent } from './entityContents'; @@ -37,5 +36,5 @@ export default createFrontendPlugin({ kubernetesAuthProvidersApi, kubernetesClusterLinkFormatterApi, ], - routes: convertLegacyRouteRefs({ kubernetes: rootCatalogKubernetesRouteRef }), + routes: { kubernetes: rootCatalogKubernetesRouteRef }, }); diff --git a/plugins/mui-to-bui/report.api.md b/plugins/mui-to-bui/report.api.md index 519f0c1bc7..db1d49f828 100644 --- a/plugins/mui-to-bui/report.api.md +++ b/plugins/mui-to-bui/report.api.md @@ -10,8 +10,8 @@ import { JSX as JSX_2 } from 'react'; import { JSX as JSX_3 } from 'react/jsx-runtime'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; -import { RouteRef as RouteRef_2 } from '@backstage/core-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; // @public (undocumented) export const BuiThemerPage: () => JSX_3.Element; @@ -19,7 +19,7 @@ export const BuiThemerPage: () => JSX_3.Element; // @public (undocumented) export const buiThemerPlugin: BackstagePlugin< { - root: RouteRef_2; + root: RouteRef; }, {} >; @@ -44,7 +44,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -55,7 +55,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/mui-to-bui/src/plugin.tsx b/plugins/mui-to-bui/src/plugin.tsx index aca19c9978..ccebe6e379 100644 --- a/plugins/mui-to-bui/src/plugin.tsx +++ b/plugins/mui-to-bui/src/plugin.tsx @@ -14,10 +14,6 @@ * limitations under the License. */ -import { - convertLegacyRouteRef, - convertLegacyRouteRefs, -} from '@backstage/core-compat-api'; import { createPlugin, createRoutableExtension, @@ -57,11 +53,11 @@ export default createFrontendPlugin({ path: '/mui-to-bui', loader: () => import('./components/BuiThemerPage').then(m => ), - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, }, }), ], - routes: convertLegacyRouteRefs({ + routes: { root: rootRouteRef, - }), + }, }); diff --git a/plugins/notifications/report-alpha.api.md b/plugins/notifications/report-alpha.api.md index 713d4c3998..98d036365e 100644 --- a/plugins/notifications/report-alpha.api.md +++ b/plugins/notifications/report-alpha.api.md @@ -11,7 +11,8 @@ import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; // @alpha (undocumented) const _default: OverridableFrontendPlugin< @@ -48,7 +49,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -59,7 +60,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; } diff --git a/plugins/notifications/src/alpha.tsx b/plugins/notifications/src/alpha.tsx index 6d32150c35..32b9ae429a 100644 --- a/plugins/notifications/src/alpha.tsx +++ b/plugins/notifications/src/alpha.tsx @@ -22,16 +22,12 @@ import { fetchApiRef, } from '@backstage/frontend-plugin-api'; import { rootRouteRef } from './routes'; -import { - convertLegacyRouteRef, - convertLegacyRouteRefs, -} from '@backstage/core-compat-api'; import { NotificationsClient, notificationsApiRef } from './api'; const page = PageBlueprint.make({ params: { path: '/notifications', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: () => import('./components/NotificationsPage').then(m => ( @@ -53,9 +49,9 @@ const api = ApiBlueprint.make({ export default createFrontendPlugin({ pluginId: 'notifications', info: { packageJson: () => import('../package.json') }, - routes: convertLegacyRouteRefs({ + routes: { root: rootRouteRef, - }), + }, // TODO(Rugvip): Nav item (i.e. NotificationsSidebarItem) currently needs to be installed manually extensions: [page, api], }); diff --git a/plugins/org/report-alpha.api.md b/plugins/org/report-alpha.api.md index 3e113868a6..05f1169dfb 100644 --- a/plugins/org/report-alpha.api.md +++ b/plugins/org/report-alpha.api.md @@ -8,7 +8,7 @@ import { EntityCardType } from '@backstage/plugin-catalog-react/alpha'; import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; -import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; +import { ExternalRouteRef } from '@backstage/core-plugin-api'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; @@ -18,7 +18,7 @@ import { TranslationRef } from '@backstage/frontend-plugin-api'; const _default: OverridableFrontendPlugin< {}, { - catalogIndex: ExternalRouteRef; + catalogIndex: ExternalRouteRef; }, { 'entity-card:org/group-profile': OverridableExtensionDefinition<{ diff --git a/plugins/org/src/alpha.tsx b/plugins/org/src/alpha.tsx index 6e158436c3..57924a0269 100644 --- a/plugins/org/src/alpha.tsx +++ b/plugins/org/src/alpha.tsx @@ -14,7 +14,6 @@ * limitations under the License. */ -import { convertLegacyRouteRefs } from '@backstage/core-compat-api'; import { createFrontendPlugin } from '@backstage/frontend-plugin-api'; import { catalogIndexRouteRef } from './routes'; import { EntityCardBlueprint } from '@backstage/plugin-catalog-react/alpha'; @@ -122,9 +121,9 @@ export default createFrontendPlugin({ EntityOwnershipCard, EntityUserProfileCard, ], - externalRoutes: convertLegacyRouteRefs({ + externalRoutes: { catalogIndex: catalogIndexRouteRef, - }), + }, }); export { orgTranslationRef } from './translation'; diff --git a/plugins/scaffolder/report-alpha.api.md b/plugins/scaffolder/report-alpha.api.md index 80c0054882..df46f9feb6 100644 --- a/plugins/scaffolder/report-alpha.api.md +++ b/plugins/scaffolder/report-alpha.api.md @@ -14,7 +14,7 @@ import { EntityPredicate } from '@backstage/plugin-catalog-react/alpha'; import { ExtensionBlueprintParams } from '@backstage/frontend-plugin-api'; import { ExtensionDataRef } from '@backstage/frontend-plugin-api'; import { ExtensionInput } from '@backstage/frontend-plugin-api'; -import { ExternalRouteRef } from '@backstage/frontend-plugin-api'; +import { ExternalRouteRef } from '@backstage/core-plugin-api'; import { FieldExtensionOptions } from '@backstage/plugin-scaffolder-react'; import { FormField } from '@backstage/plugin-scaffolder-react/alpha'; import { formFieldsApiRef } from '@backstage/plugin-scaffolder-react/alpha'; @@ -28,10 +28,11 @@ import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; import { PathParams } from '@backstage/core-plugin-api'; import { ReviewStepProps } from '@backstage/plugin-scaffolder-react'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { ScaffolderFormDecorator } from '@backstage/plugin-scaffolder-react/alpha'; import { ScaffolderFormFieldsApi } from '@backstage/plugin-scaffolder-react/alpha'; -import { SubRouteRef } from '@backstage/frontend-plugin-api'; +import { SubRouteRef } from '@backstage/core-plugin-api'; import { TemplateEntityV1beta3 } from '@backstage/plugin-scaffolder-common'; import { TemplateGroupFilter } from '@backstage/plugin-scaffolder-react'; import { TranslationRef } from '@backstage/core-plugin-api/alpha'; @@ -50,12 +51,15 @@ const _default: OverridableFrontendPlugin< templatingExtensions: SubRouteRef; }, { - registerComponent: ExternalRouteRef; - viewTechDoc: ExternalRouteRef<{ - name: string; - kind: string; - namespace: string; - }>; + registerComponent: ExternalRouteRef; + viewTechDoc: ExternalRouteRef< + { + name: string; + kind: string; + namespace: string; + }, + true + >; }, { 'api:scaffolder': OverridableExtensionDefinition<{ @@ -175,7 +179,7 @@ const _default: OverridableFrontendPlugin< { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }, 'core.nav-item.target', {} @@ -184,7 +188,7 @@ const _default: OverridableFrontendPlugin< params: { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }; }>; 'page:scaffolder': OverridableExtensionDefinition<{ @@ -198,7 +202,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -223,7 +227,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; 'scaffolder-form-field:scaffolder/entity-name-picker': OverridableExtensionDefinition<{ diff --git a/plugins/scaffolder/src/alpha/extensions.tsx b/plugins/scaffolder/src/alpha/extensions.tsx index 30054ece6e..429e6d493a 100644 --- a/plugins/scaffolder/src/alpha/extensions.tsx +++ b/plugins/scaffolder/src/alpha/extensions.tsx @@ -14,7 +14,6 @@ * limitations under the License. */ -import { convertLegacyRouteRef } from '@backstage/core-compat-api'; import { ApiBlueprint, createExtensionInput, @@ -42,7 +41,7 @@ export const scaffolderPage = PageBlueprint.makeWithOverrides({ i.get(FormFieldBlueprint.dataRefs.formFieldLoader), ); return originalFactory({ - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, path: '/create', loader: () => import('../components/Router/Router').then(m => ( @@ -54,7 +53,7 @@ export const scaffolderPage = PageBlueprint.makeWithOverrides({ export const scaffolderNavItem = NavItemBlueprint.make({ params: { - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, title: 'Create...', icon: CreateComponentIcon, }, diff --git a/plugins/scaffolder/src/alpha/plugin.tsx b/plugins/scaffolder/src/alpha/plugin.tsx index 3b41aa3893..5bb744e2ea 100644 --- a/plugins/scaffolder/src/alpha/plugin.tsx +++ b/plugins/scaffolder/src/alpha/plugin.tsx @@ -14,7 +14,6 @@ * limitations under the License. */ -import { convertLegacyRouteRefs } from '@backstage/core-compat-api'; import { createFrontendPlugin } from '@backstage/frontend-plugin-api'; import { actionsRouteRef, @@ -60,7 +59,7 @@ const scaffolderEntityIconLink = EntityIconLinkBlueprint.make({ export default createFrontendPlugin({ pluginId: 'scaffolder', info: { packageJson: () => import('../../package.json') }, - routes: convertLegacyRouteRefs({ + routes: { root: rootRouteRef, selectedTemplate: selectedTemplateRouteRef, ongoingTask: scaffolderTaskRouteRef, @@ -68,11 +67,11 @@ export default createFrontendPlugin({ listTasks: scaffolderListTaskRouteRef, edit: editRouteRef, templatingExtensions: templatingExtensionsRouteRef, - }), - externalRoutes: convertLegacyRouteRefs({ + }, + externalRoutes: { registerComponent: registerComponentRouteRef, viewTechDoc: viewTechDocRouteRef, - }), + }, extensions: [ scaffolderApi, scaffolderPage, diff --git a/plugins/search/report-alpha.api.md b/plugins/search/report-alpha.api.md index 5ac036ca68..742bf1bf3b 100644 --- a/plugins/search/report-alpha.api.md +++ b/plugins/search/report-alpha.api.md @@ -15,6 +15,7 @@ import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/core-plugin-api'; import { SearchFilterExtensionComponent } from '@backstage/plugin-search-react/alpha'; import { SearchResultItemExtensionComponent } from '@backstage/plugin-search-react/alpha'; import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-react/alpha'; @@ -23,7 +24,7 @@ import { TranslationRef } from '@backstage/core-plugin-api/alpha'; // @alpha (undocumented) const _default: OverridableFrontendPlugin< { - root: RouteRef; + root: RouteRef_2; }, {}, { diff --git a/plugins/search/src/alpha.tsx b/plugins/search/src/alpha.tsx index eb98f70ee0..2efe9978e0 100644 --- a/plugins/search/src/alpha.tsx +++ b/plugins/search/src/alpha.tsx @@ -68,10 +68,6 @@ import { rootRouteRef } from './plugin'; import { SearchClient } from './apis'; import { SearchType } from './components/SearchType'; import { UrlUpdater } from './components/SearchPage/SearchPage'; -import { - convertLegacyRouteRef, - convertLegacyRouteRefs, -} from '@backstage/core-compat-api'; /** @alpha */ export const searchApi = ApiBlueprint.make({ @@ -115,7 +111,7 @@ export const searchPage = PageBlueprint.makeWithOverrides({ factory(originalFactory, { config, inputs }) { return originalFactory({ path: '/search', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: async () => { const getResultItemComponent = (result: SearchResult) => { const value = inputs.items.find(item => @@ -267,7 +263,7 @@ export const searchPage = PageBlueprint.makeWithOverrides({ /** @alpha */ export const searchNavItem = NavItemBlueprint.make({ params: { - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, title: 'Search', icon: SearchIcon, }, @@ -278,9 +274,9 @@ export default createFrontendPlugin({ pluginId: 'search', info: { packageJson: () => import('../package.json') }, extensions: [searchApi, searchPage, searchNavItem], - routes: convertLegacyRouteRefs({ + routes: { root: rootRouteRef, - }), + }, }); /** @alpha */ diff --git a/plugins/techdocs/report-alpha.api.md b/plugins/techdocs/report-alpha.api.md index f950670f22..bc3a5d6c34 100644 --- a/plugins/techdocs/report-alpha.api.md +++ b/plugins/techdocs/report-alpha.api.md @@ -18,7 +18,8 @@ import { IconLinkVerticalProps } from '@backstage/core-components'; import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; -import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef } from '@backstage/core-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/frontend-plugin-api'; import { SearchResultItemExtensionComponent } from '@backstage/plugin-search-react/alpha'; import { SearchResultItemExtensionPredicate } from '@backstage/plugin-search-react/alpha'; import { SearchResultListItemBlueprintParams } from '@backstage/plugin-search-react/alpha'; @@ -107,7 +108,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -171,7 +172,7 @@ const _default: OverridableFrontendPlugin< defaultGroup?: [Error: `Use the 'group' param instead`]; group?: keyof defaultEntityContentGroups | (string & {}); loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; filter?: string | EntityPredicate | ((entity: Entity) => boolean); }; }>; @@ -223,7 +224,7 @@ const _default: OverridableFrontendPlugin< { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }, 'core.nav-item.target', {} @@ -232,7 +233,7 @@ const _default: OverridableFrontendPlugin< params: { title: string; icon: IconComponent; - routeRef: RouteRef; + routeRef: RouteRef_2; }; }>; 'page:techdocs': OverridableExtensionDefinition<{ @@ -248,7 +249,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -259,7 +260,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; 'page:techdocs/reader': OverridableExtensionDefinition<{ @@ -273,7 +274,7 @@ const _default: OverridableFrontendPlugin< | ExtensionDataRef | ExtensionDataRef | ExtensionDataRef< - RouteRef, + RouteRef_2, 'core.routing.ref', { optional: true; @@ -298,7 +299,7 @@ const _default: OverridableFrontendPlugin< defaultPath?: [Error: `Use the 'path' param instead`]; path: string; loader: () => Promise; - routeRef?: RouteRef; + routeRef?: RouteRef_2; }; }>; 'search-result-list-item:techdocs': OverridableExtensionDefinition<{ diff --git a/plugins/techdocs/src/alpha/index.tsx b/plugins/techdocs/src/alpha/index.tsx index ebc84a1837..d3fc94c7a8 100644 --- a/plugins/techdocs/src/alpha/index.tsx +++ b/plugins/techdocs/src/alpha/index.tsx @@ -29,10 +29,6 @@ import { discoveryApiRef, fetchApiRef, } from '@backstage/core-plugin-api'; -import { - convertLegacyRouteRef, - convertLegacyRouteRefs, -} from '@backstage/core-compat-api'; import { EntityContentBlueprint, EntityIconLinkBlueprint, @@ -138,7 +134,7 @@ export const techDocsSearchResultListItemExtension = const techDocsPage = PageBlueprint.make({ params: { path: '/docs', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, loader: () => import('../home/components/TechDocsIndexPage').then(m => ( @@ -166,7 +162,7 @@ const techDocsReaderPage = PageBlueprint.makeWithOverrides({ return originalFactory({ path: '/docs/:namespace/:kind/:name', - routeRef: convertLegacyRouteRef(rootDocsRouteRef), + routeRef: rootDocsRouteRef, loader: async () => await import('../Router').then(({ TechDocsReaderRouter }) => ( @@ -199,7 +195,7 @@ const techDocsEntityContent = EntityContentBlueprint.makeWithOverrides({ { path: 'docs', title: 'TechDocs', - routeRef: convertLegacyRouteRef(rootCatalogDocsRouteRef), + routeRef: rootCatalogDocsRouteRef, loader: () => import('../Router').then(({ EmbeddedDocsRouter }) => { const addons = context.inputs.addons.map(output => { @@ -237,7 +233,7 @@ const techDocsNavItem = NavItemBlueprint.make({ params: { icon: LibraryBooks, title: 'Docs', - routeRef: convertLegacyRouteRef(rootRouteRef), + routeRef: rootRouteRef, }, }); @@ -256,9 +252,9 @@ export default createFrontendPlugin({ techDocsEntityContentEmptyState, techDocsSearchResultListItemExtension, ], - routes: convertLegacyRouteRefs({ + routes: { root: rootRouteRef, docRoot: rootDocsRouteRef, entityContent: rootCatalogDocsRouteRef, - }), + }, }); diff --git a/plugins/user-settings/report-alpha.api.md b/plugins/user-settings/report-alpha.api.md index e9f05fe3f9..5d28bb85aa 100644 --- a/plugins/user-settings/report-alpha.api.md +++ b/plugins/user-settings/report-alpha.api.md @@ -12,12 +12,13 @@ import { JSX as JSX_2 } from 'react'; import { OverridableExtensionDefinition } from '@backstage/frontend-plugin-api'; import { OverridableFrontendPlugin } from '@backstage/frontend-plugin-api'; import { RouteRef } from '@backstage/frontend-plugin-api'; +import { RouteRef as RouteRef_2 } from '@backstage/core-plugin-api'; import { TranslationRef } from '@backstage/core-plugin-api/alpha'; // @alpha (undocumented) const _default: OverridableFrontendPlugin< { - root: RouteRef; + root: RouteRef_2; }, {}, { diff --git a/plugins/user-settings/src/alpha.tsx b/plugins/user-settings/src/alpha.tsx index bd0d9a1a82..bea75bbdd8 100644 --- a/plugins/user-settings/src/alpha.tsx +++ b/plugins/user-settings/src/alpha.tsx @@ -20,10 +20,6 @@ import { PageBlueprint, NavItemBlueprint, } from '@backstage/frontend-plugin-api'; -import { - convertLegacyRouteRef, - convertLegacyRouteRefs, -} from '@backstage/core-compat-api'; import SettingsIcon from '@material-ui/icons/Settings'; import { settingsRouteRef } from './plugin'; @@ -39,7 +35,7 @@ const userSettingsPage = PageBlueprint.makeWithOverrides({ factory(originalFactory, { inputs }) { return originalFactory({ path: '/settings', - routeRef: convertLegacyRouteRef(settingsRouteRef), + routeRef: settingsRouteRef, loader: () => import('./components/SettingsPage').then(m => ( import('../package.json') }, extensions: [userSettingsPage, settingsNavItem], - routes: convertLegacyRouteRefs({ + routes: { root: settingsRouteRef, - }), + }, });