From 6a4f081128a47bc86fbcf4d9885303ca2e8025fe Mon Sep 17 00:00:00 2001 From: Emma Indal Date: Mon, 11 Apr 2022 12:08:29 +0200 Subject: [PATCH] let template logos live in home plugin for now Signed-off-by: Emma Indal --- .../home/templates/DefaultTemplate.stories.tsx | 4 ++-- plugins/home/api-report.md | 13 +++++++++++++ .../home/src/assets}/TemplateBackstageLogo.tsx | 2 +- .../home/src/assets}/TemplateBackstageLogoIcon.tsx | 1 - .../templates => plugins/home/src/assets}/index.ts | 6 +++--- .../CompanyLogo/CompanyLogo.stories.tsx | 2 +- .../homePageComponents/Toolkit/Toolkit.stories.tsx | 2 +- plugins/home/src/index.ts | 1 + 8 files changed, 22 insertions(+), 9 deletions(-) rename {packages/app/src/components/home/templates => plugins/home/src/assets}/TemplateBackstageLogo.tsx (99%) rename {packages/app/src/components/home/templates => plugins/home/src/assets}/TemplateBackstageLogoIcon.tsx (99%) rename {packages/app/src/components/home/templates => plugins/home/src/assets}/index.ts (76%) diff --git a/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx index b2f6034709..8b9c5100b1 100644 --- a/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx +++ b/packages/app/src/components/home/templates/DefaultTemplate.stories.tsx @@ -14,12 +14,12 @@ * limitations under the License. */ -import { TemplateBackstageLogo } from './TemplateBackstageLogo'; -import { TemplateBackstageLogoIcon } from './TemplateBackstageLogoIcon'; import { HomePageToolkit, HomePageCompanyLogo, HomePageStarredEntities, + TemplateBackstageLogo, + TemplateBackstageLogoIcon } from '@backstage/plugin-home'; import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils'; import { Content, Page, InfoCard } from '@backstage/core-components'; diff --git a/plugins/home/api-report.md b/plugins/home/api-report.md index 9bd577da7c..21c5592636 100644 --- a/plugins/home/api-report.md +++ b/plugins/home/api-report.md @@ -119,11 +119,24 @@ export const SettingsModal: (props: { children: JSX.Element; }) => JSX.Element; +// Warning: (ae-missing-release-tag) "TemplateBackstageLogo" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const TemplateBackstageLogo: (props: { + classes: Classes; +}) => JSX.Element; + +// Warning: (ae-missing-release-tag) "TemplateBackstageLogoIcon" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal) +// +// @public (undocumented) +export const TemplateBackstageLogoIcon: () => JSX.Element; + // @public export const WelcomeTitle: () => JSX.Element; // Warnings were encountered during analysis: // +// src/assets/TemplateBackstageLogo.d.ts:7:5 - (ae-forgotten-export) The symbol "Classes" needs to be exported by the entry point index.d.ts // src/extensions.d.ts:6:5 - (ae-forgotten-export) The symbol "RendererProps" needs to be exported by the entry point index.d.ts // src/extensions.d.ts:27:5 - (ae-forgotten-export) The symbol "ComponentParts" needs to be exported by the entry point index.d.ts ``` diff --git a/packages/app/src/components/home/templates/TemplateBackstageLogo.tsx b/plugins/home/src/assets/TemplateBackstageLogo.tsx similarity index 99% rename from packages/app/src/components/home/templates/TemplateBackstageLogo.tsx rename to plugins/home/src/assets/TemplateBackstageLogo.tsx index edce9bb02e..0fc908ee39 100644 --- a/packages/app/src/components/home/templates/TemplateBackstageLogo.tsx +++ b/plugins/home/src/assets/TemplateBackstageLogo.tsx @@ -19,7 +19,7 @@ import React from 'react'; type Classes = { svg: string; path: string; -} +}; export const TemplateBackstageLogo = (props: { classes: Classes }) => { return ( diff --git a/packages/app/src/components/home/templates/TemplateBackstageLogoIcon.tsx b/plugins/home/src/assets/TemplateBackstageLogoIcon.tsx similarity index 99% rename from packages/app/src/components/home/templates/TemplateBackstageLogoIcon.tsx rename to plugins/home/src/assets/TemplateBackstageLogoIcon.tsx index 2116b48784..09c4405286 100644 --- a/packages/app/src/components/home/templates/TemplateBackstageLogoIcon.tsx +++ b/plugins/home/src/assets/TemplateBackstageLogoIcon.tsx @@ -43,4 +43,3 @@ export const TemplateBackstageLogoIcon = () => { ); }; - diff --git a/packages/app/src/components/home/templates/index.ts b/plugins/home/src/assets/index.ts similarity index 76% rename from packages/app/src/components/home/templates/index.ts rename to plugins/home/src/assets/index.ts index bfebe73cd8..79de43ca99 100644 --- a/packages/app/src/components/home/templates/index.ts +++ b/plugins/home/src/assets/index.ts @@ -1,5 +1,5 @@ /* - * Copyright 2021 The Backstage Authors + * Copyright 2020 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. @@ -14,5 +14,5 @@ * limitations under the License. */ -export { TemplateBackstageLogoIcon } from './TemplateBackstageLogoIcon'; -export { TemplateBackstageLogo } from './TemplateBackstageLogo' +export * from './TemplateBackstageLogo'; +export * from './TemplateBackstageLogoIcon'; diff --git a/plugins/home/src/homePageComponents/CompanyLogo/CompanyLogo.stories.tsx b/plugins/home/src/homePageComponents/CompanyLogo/CompanyLogo.stories.tsx index ab71eea54e..741ad2e977 100644 --- a/plugins/home/src/homePageComponents/CompanyLogo/CompanyLogo.stories.tsx +++ b/plugins/home/src/homePageComponents/CompanyLogo/CompanyLogo.stories.tsx @@ -14,7 +14,7 @@ * limitations under the License. */ -import { TemplateBackstageLogo } from '../../templates'; +import { TemplateBackstageLogo } from '../../assets'; import { HomePageCompanyLogo } from '../../plugin'; import { rootRouteRef } from '../../routes'; import { wrapInTestApp, TestApiProvider } from '@backstage/test-utils'; diff --git a/plugins/home/src/homePageComponents/Toolkit/Toolkit.stories.tsx b/plugins/home/src/homePageComponents/Toolkit/Toolkit.stories.tsx index cad188c5d6..9a82301e49 100644 --- a/plugins/home/src/homePageComponents/Toolkit/Toolkit.stories.tsx +++ b/plugins/home/src/homePageComponents/Toolkit/Toolkit.stories.tsx @@ -20,7 +20,7 @@ import { Grid } from '@material-ui/core'; import React, { ComponentType } from 'react'; import { ComponentAccordion } from '../../componentRenderers'; import { HomePageToolkit } from '../../plugin'; -import { TemplateBackstageLogoIcon } from '../../templates'; +import { TemplateBackstageLogoIcon } from '../../assets'; export default { title: 'Plugins/Home/Components/Toolkit', diff --git a/plugins/home/src/index.ts b/plugins/home/src/index.ts index d30b76a7fc..8f137d589b 100644 --- a/plugins/home/src/index.ts +++ b/plugins/home/src/index.ts @@ -33,6 +33,7 @@ export { WelcomeTitle, } from './plugin'; export { SettingsModal, HeaderWorldClock } from './components'; +export * from './assets'; export type { ClockConfig } from './components'; export { createCardExtension } from './extensions'; export type { ComponentRenderer } from './extensions';