From 5773dbac789a6fbe64d3e607e8c6672eda2d9da2 Mon Sep 17 00:00:00 2001 From: Gabriel Dugny Date: Fri, 16 Jan 2026 21:18:44 +0100 Subject: [PATCH] chore: Update imports, rename components Signed-off-by: Gabriel Dugny --- packages/techdocs-cli-embedded-app/package.json | 1 + packages/techdocs-cli-embedded-app/src/App.tsx | 2 +- .../src/components/{Root => Sidebar}/LogoFull.tsx | 0 .../src/components/{Root => Sidebar}/LogoIcon.tsx | 0 .../components/{Root/Root.tsx => Sidebar/Sidebar.tsx} | 11 ++++------- .../src/components/{Root => Sidebar}/index.ts | 2 +- yarn.lock | 1 + 7 files changed, 8 insertions(+), 9 deletions(-) rename packages/techdocs-cli-embedded-app/src/components/{Root => Sidebar}/LogoFull.tsx (100%) rename packages/techdocs-cli-embedded-app/src/components/{Root => Sidebar}/LogoIcon.tsx (100%) rename packages/techdocs-cli-embedded-app/src/components/{Root/Root.tsx => Sidebar/Sidebar.tsx} (90%) rename packages/techdocs-cli-embedded-app/src/components/{Root => Sidebar}/index.ts (93%) diff --git a/packages/techdocs-cli-embedded-app/package.json b/packages/techdocs-cli-embedded-app/package.json index 62503eed6d..c975203738 100644 --- a/packages/techdocs-cli-embedded-app/package.json +++ b/packages/techdocs-cli-embedded-app/package.json @@ -40,6 +40,7 @@ "@backstage/frontend-defaults": "workspace:^", "@backstage/frontend-plugin-api": "workspace:^", "@backstage/integration-react": "workspace:^", + "@backstage/plugin-app-react": "workspace:^", "@backstage/plugin-catalog": "workspace:^", "@backstage/plugin-techdocs": "workspace:^", "@backstage/plugin-techdocs-react": "workspace:^", diff --git a/packages/techdocs-cli-embedded-app/src/App.tsx b/packages/techdocs-cli-embedded-app/src/App.tsx index 0c8fdea781..455e92110c 100644 --- a/packages/techdocs-cli-embedded-app/src/App.tsx +++ b/packages/techdocs-cli-embedded-app/src/App.tsx @@ -24,7 +24,7 @@ import { apis } from './apis'; import { configLoader } from './config'; import { createFrontendModule } from '@backstage/frontend-plugin-api'; -import { SidebarContent } from './components/Root/Root'; +import { SidebarContent } from './components/Sidebar'; import { techDocsThemeToggleAddonModule, techdocsLiveReloadAddonModule, diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/LogoFull.tsx b/packages/techdocs-cli-embedded-app/src/components/Sidebar/LogoFull.tsx similarity index 100% rename from packages/techdocs-cli-embedded-app/src/components/Root/LogoFull.tsx rename to packages/techdocs-cli-embedded-app/src/components/Sidebar/LogoFull.tsx diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/LogoIcon.tsx b/packages/techdocs-cli-embedded-app/src/components/Sidebar/LogoIcon.tsx similarity index 100% rename from packages/techdocs-cli-embedded-app/src/components/Root/LogoIcon.tsx rename to packages/techdocs-cli-embedded-app/src/components/Sidebar/LogoIcon.tsx diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx b/packages/techdocs-cli-embedded-app/src/components/Sidebar/Sidebar.tsx similarity index 90% rename from packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx rename to packages/techdocs-cli-embedded-app/src/components/Sidebar/Sidebar.tsx index 0d40ebe1d5..fed1f0f36d 100644 --- a/packages/techdocs-cli-embedded-app/src/components/Root/Root.tsx +++ b/packages/techdocs-cli-embedded-app/src/components/Sidebar/Sidebar.tsx @@ -13,9 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -import { PropsWithChildren } from 'react'; - import { makeStyles } from '@material-ui/core/styles'; import LibraryBooks from '@material-ui/icons/LibraryBooks'; import LogoFull from './LogoFull'; @@ -30,7 +27,7 @@ import { useSidebarOpenState, Link, } from '@backstage/core-components'; -import { NavContentBlueprint } from '@backstage/frontend-plugin-api'; +import { NavContentBlueprint } from '@backstage/plugin-app-react'; const useSidebarLogoStyles = makeStyles({ root: { @@ -64,7 +61,7 @@ const SidebarLogo = () => { ); }; -export const Root = ({ children }: PropsWithChildren<{}>) => ( +export const SidebarNav = (): React.ReactElement => ( @@ -77,11 +74,11 @@ export const Root = ({ children }: PropsWithChildren<{}>) => ( /> {/* End global nav */} - {children} ); + export const SidebarContent = NavContentBlueprint.make({ params: { - component: () => , + component: () => , }, }); diff --git a/packages/techdocs-cli-embedded-app/src/components/Root/index.ts b/packages/techdocs-cli-embedded-app/src/components/Sidebar/index.ts similarity index 93% rename from packages/techdocs-cli-embedded-app/src/components/Root/index.ts rename to packages/techdocs-cli-embedded-app/src/components/Sidebar/index.ts index dff706f08f..485e09a70c 100644 --- a/packages/techdocs-cli-embedded-app/src/components/Root/index.ts +++ b/packages/techdocs-cli-embedded-app/src/components/Sidebar/index.ts @@ -14,4 +14,4 @@ * limitations under the License. */ -export { Root } from './Root'; +export { SidebarContent } from './Sidebar'; diff --git a/yarn.lock b/yarn.lock index 61d19b672e..00ed486255 100644 --- a/yarn.lock +++ b/yarn.lock @@ -47935,6 +47935,7 @@ __metadata: "@backstage/frontend-defaults": "workspace:^" "@backstage/frontend-plugin-api": "workspace:^" "@backstage/integration-react": "workspace:^" + "@backstage/plugin-app-react": "workspace:^" "@backstage/plugin-catalog": "workspace:^" "@backstage/plugin-techdocs": "workspace:^" "@backstage/plugin-techdocs-react": "workspace:^"