From 066772d9219b003049dadfbb5a06e47f25174757 Mon Sep 17 00:00:00 2001 From: sebastienlorber Date: Fri, 8 Jul 2022 14:22:01 +0200 Subject: [PATCH 1/2] nest theme icons under subfolder @theme/Icon/* --- .../src/theme-classic.d.ts | 18 +++++++++--------- .../src/theme/AnnouncementBar/index.tsx | 2 +- .../src/theme/ColorModeToggle/index.tsx | 4 ++-- .../src/theme/DocBreadcrumbs/index.tsx | 2 +- .../Layout/Sidebar/ExpandButton/index.tsx | 2 +- .../Desktop/CollapseButton/index.tsx | 2 +- .../src/theme/DocSidebarItem/Link/index.tsx | 2 +- .../src/theme/EditThisPage/index.tsx | 2 +- .../src/theme/Footer/LinkItem/index.tsx | 2 +- .../theme/{IconArrow => Icon/Arrow}/index.tsx | 2 +- .../theme/{IconClose => Icon/Close}/index.tsx | 2 +- .../{IconDarkMode => Icon/DarkMode}/index.tsx | 2 +- .../theme/{IconEdit => Icon/Edit}/index.tsx | 2 +- .../{IconEdit => Icon/Edit}/styles.module.css | 0 .../ExternalLink}/index.tsx | 2 +- .../ExternalLink}/styles.module.css | 0 .../theme/{IconHome => Icon/Home}/index.tsx | 2 +- .../{IconLanguage => Icon/Language}/index.tsx | 2 +- .../LightMode}/index.tsx | 2 +- .../theme/{IconMenu => Icon/Menu}/index.tsx | 2 +- .../Navbar/MobileSidebar/Header/index.tsx | 2 +- .../Navbar/MobileSidebar/Toggle/index.tsx | 2 +- .../LocaleDropdownNavbarItem/index.tsx | 2 +- .../src/theme/NavbarItem/NavbarNavLink.tsx | 2 +- .../ChangelogItem/Header/Authors/index.tsx | 2 +- .../{IconExpand => Icon/Expand}/index.tsx | 2 +- website/src/plugins/changelog/theme/types.d.ts | 2 +- 27 files changed, 34 insertions(+), 34 deletions(-) rename packages/docusaurus-theme-classic/src/theme/{IconArrow => Icon/Arrow}/index.tsx (95%) rename packages/docusaurus-theme-classic/src/theme/{IconClose => Icon/Close}/index.tsx (92%) rename packages/docusaurus-theme-classic/src/theme/{IconDarkMode => Icon/DarkMode}/index.tsx (94%) rename packages/docusaurus-theme-classic/src/theme/{IconEdit => Icon/Edit}/index.tsx (94%) rename packages/docusaurus-theme-classic/src/theme/{IconEdit => Icon/Edit}/styles.module.css (100%) rename packages/docusaurus-theme-classic/src/theme/{IconExternalLink => Icon/ExternalLink}/index.tsx (93%) rename packages/docusaurus-theme-classic/src/theme/{IconExternalLink => Icon/ExternalLink}/styles.module.css (100%) rename packages/docusaurus-theme-classic/src/theme/{IconHome => Icon/Home}/index.tsx (92%) rename packages/docusaurus-theme-classic/src/theme/{IconLanguage => Icon/Language}/index.tsx (94%) rename packages/docusaurus-theme-classic/src/theme/{IconLightMode => Icon/LightMode}/index.tsx (96%) rename packages/docusaurus-theme-classic/src/theme/{IconMenu => Icon/Menu}/index.tsx (93%) rename website/src/plugins/changelog/theme/{IconExpand => Icon/Expand}/index.tsx (97%) diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts index a3dd2cb5d873..8922ffce09f7 100644 --- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts +++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts @@ -1256,7 +1256,7 @@ declare module '@theme/Logo' { export default function Logo(props: Props): JSX.Element; } -declare module '@theme/IconArrow' { +declare module '@theme/Icon/Arrow' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1264,7 +1264,7 @@ declare module '@theme/IconArrow' { export default function IconArrow(props: Props): JSX.Element; } -declare module '@theme/IconDarkMode' { +declare module '@theme/Icon/DarkMode' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1272,7 +1272,7 @@ declare module '@theme/IconDarkMode' { export default function IconDarkMode(props: Props): JSX.Element; } -declare module '@theme/IconEdit' { +declare module '@theme/Icon/Edit' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1280,7 +1280,7 @@ declare module '@theme/IconEdit' { export default function IconEdit(props: Props): JSX.Element; } -declare module '@theme/IconHome' { +declare module '@theme/Icon/Home' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1288,7 +1288,7 @@ declare module '@theme/IconHome' { export default function IconHome(props: Props): JSX.Element; } -declare module '@theme/IconLightMode' { +declare module '@theme/Icon/LightMode' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1296,7 +1296,7 @@ declare module '@theme/IconLightMode' { export default function IconLightMode(props: Props): JSX.Element; } -declare module '@theme/IconMenu' { +declare module '@theme/Icon/Menu' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1304,7 +1304,7 @@ declare module '@theme/IconMenu' { export default function IconMenu(props: Props): JSX.Element; } -declare module '@theme/IconClose' { +declare module '@theme/Icon/Close' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1312,7 +1312,7 @@ declare module '@theme/IconClose' { export default function IconClose(props: Props): JSX.Element; } -declare module '@theme/IconLanguage' { +declare module '@theme/Icon/Language' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} @@ -1320,7 +1320,7 @@ declare module '@theme/IconLanguage' { export default function IconLanguage(props: Props): JSX.Element; } -declare module '@theme/IconExternalLink' { +declare module '@theme/Icon/ExternalLink' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> {} diff --git a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx index 771136d4d6da..1cf1b377bbc2 100644 --- a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/index.tsx @@ -10,7 +10,7 @@ import clsx from 'clsx'; import {useThemeConfig} from '@docusaurus/theme-common'; import {useAnnouncementBar} from '@docusaurus/theme-common/internal'; import {translate} from '@docusaurus/Translate'; -import IconClose from '@theme/IconClose'; +import IconClose from '@theme/Icon/Close'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx b/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx index 2b0407a547be..d6f5f2f9f088 100644 --- a/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx @@ -9,8 +9,8 @@ import React from 'react'; import clsx from 'clsx'; import useIsBrowser from '@docusaurus/useIsBrowser'; import {translate} from '@docusaurus/Translate'; -import IconLightMode from '@theme/IconLightMode'; -import IconDarkMode from '@theme/IconDarkMode'; +import IconLightMode from '@theme/Icon/LightMode'; +import IconDarkMode from '@theme/Icon/DarkMode'; import type {Props} from '@theme/ColorModeToggle'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx index 29fad8f97044..1e296be0bded 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx @@ -15,7 +15,7 @@ import { import Link from '@docusaurus/Link'; import useBaseUrl from '@docusaurus/useBaseUrl'; import {translate} from '@docusaurus/Translate'; -import IconHome from '@theme/IconHome'; +import IconHome from '@theme/Icon/Home'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx index 0cf889639321..688501a0ace5 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; import {translate} from '@docusaurus/Translate'; -import IconArrow from '@theme/IconArrow'; +import IconArrow from '@theme/Icon/Arrow'; import type {Props} from '@theme/DocPage/Layout/Sidebar/ExpandButton'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx index f5d96d16481f..81e1f7c7e800 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx @@ -8,7 +8,7 @@ import React from 'react'; import clsx from 'clsx'; import {translate} from '@docusaurus/Translate'; -import IconArrow from '@theme/IconArrow'; +import IconArrow from '@theme/Icon/Arrow'; import type {Props} from '@theme/DocSidebar/Desktop/CollapseButton'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx index f5a686722212..a61ac7a02793 100644 --- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx @@ -11,7 +11,7 @@ import {ThemeClassNames} from '@docusaurus/theme-common'; import {isActiveSidebarItem} from '@docusaurus/theme-common/internal'; import Link from '@docusaurus/Link'; import isInternalUrl from '@docusaurus/isInternalUrl'; -import IconExternalLink from '@theme/IconExternalLink'; +import IconExternalLink from '@theme/Icon/ExternalLink'; import type {Props} from '@theme/DocSidebarItem/Link'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx index f4b55187756f..ede0b5cbed62 100644 --- a/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx @@ -8,7 +8,7 @@ import React from 'react'; import Translate from '@docusaurus/Translate'; import {ThemeClassNames} from '@docusaurus/theme-common'; -import IconEdit from '@theme/IconEdit'; +import IconEdit from '@theme/Icon/Edit'; import type {Props} from '@theme/EditThisPage'; export default function EditThisPage({editUrl}: Props): JSX.Element { diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/LinkItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/Footer/LinkItem/index.tsx index f5e334acefb8..44e1517d3957 100644 --- a/packages/docusaurus-theme-classic/src/theme/Footer/LinkItem/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Footer/LinkItem/index.tsx @@ -10,7 +10,7 @@ import React from 'react'; import Link from '@docusaurus/Link'; import useBaseUrl from '@docusaurus/useBaseUrl'; import isInternalUrl from '@docusaurus/isInternalUrl'; -import IconExternalLink from '@theme/IconExternalLink'; +import IconExternalLink from '@theme/Icon/ExternalLink'; import type {Props} from '@theme/Footer/LinkItem'; export default function FooterLinkItem({item}: Props): JSX.Element { diff --git a/packages/docusaurus-theme-classic/src/theme/IconArrow/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/Arrow/index.tsx similarity index 95% rename from packages/docusaurus-theme-classic/src/theme/IconArrow/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/Arrow/index.tsx index e358e5edc001..8f73e7b3fce9 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconArrow/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/Arrow/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconArrow'; +import type {Props} from '@theme/Icon/Arrow'; export default function IconArrow(props: Props): JSX.Element { return ( diff --git a/packages/docusaurus-theme-classic/src/theme/IconClose/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/Close/index.tsx similarity index 92% rename from packages/docusaurus-theme-classic/src/theme/IconClose/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/Close/index.tsx index 1b39a390e1f1..45dee06185f1 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconClose/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/Close/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconClose'; +import type {Props} from '@theme/Icon/Close'; export default function IconClose({ width = 21, diff --git a/packages/docusaurus-theme-classic/src/theme/IconDarkMode/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/DarkMode/index.tsx similarity index 94% rename from packages/docusaurus-theme-classic/src/theme/IconDarkMode/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/DarkMode/index.tsx index d319096eeab3..789f99702201 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconDarkMode/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/DarkMode/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconDarkMode'; +import type {Props} from '@theme/Icon/DarkMode'; export default function IconDarkMode(props: Props): JSX.Element { return ( diff --git a/packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/Edit/index.tsx similarity index 94% rename from packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/Edit/index.tsx index 004c12216598..7643646b1c2d 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/Edit/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; import clsx from 'clsx'; -import type {Props} from '@theme/IconEdit'; +import type {Props} from '@theme/Icon/Edit'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/IconEdit/styles.module.css b/packages/docusaurus-theme-classic/src/theme/Icon/Edit/styles.module.css similarity index 100% rename from packages/docusaurus-theme-classic/src/theme/IconEdit/styles.module.css rename to packages/docusaurus-theme-classic/src/theme/Icon/Edit/styles.module.css diff --git a/packages/docusaurus-theme-classic/src/theme/IconExternalLink/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/ExternalLink/index.tsx similarity index 93% rename from packages/docusaurus-theme-classic/src/theme/IconExternalLink/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/ExternalLink/index.tsx index 6f1ecb6239c5..ea618ee80d74 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconExternalLink/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/ExternalLink/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconExternalLink'; +import type {Props} from '@theme/Icon/ExternalLink'; import styles from './styles.module.css'; diff --git a/packages/docusaurus-theme-classic/src/theme/IconExternalLink/styles.module.css b/packages/docusaurus-theme-classic/src/theme/Icon/ExternalLink/styles.module.css similarity index 100% rename from packages/docusaurus-theme-classic/src/theme/IconExternalLink/styles.module.css rename to packages/docusaurus-theme-classic/src/theme/Icon/ExternalLink/styles.module.css diff --git a/packages/docusaurus-theme-classic/src/theme/IconHome/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/Home/index.tsx similarity index 92% rename from packages/docusaurus-theme-classic/src/theme/IconHome/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/Home/index.tsx index 0a2b75918351..e343a87f07b3 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconHome/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/Home/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconHome'; +import type {Props} from '@theme/Icon/Home'; export default function IconHome(props: Props): JSX.Element { return ( diff --git a/packages/docusaurus-theme-classic/src/theme/IconLanguage/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/Language/index.tsx similarity index 94% rename from packages/docusaurus-theme-classic/src/theme/IconLanguage/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/Language/index.tsx index fa3f3f969f88..b84a0ae50d26 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconLanguage/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/Language/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconLanguage'; +import type {Props} from '@theme/Icon/Language'; export default function IconLanguage({ width = 20, diff --git a/packages/docusaurus-theme-classic/src/theme/IconLightMode/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/LightMode/index.tsx similarity index 96% rename from packages/docusaurus-theme-classic/src/theme/IconLightMode/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/LightMode/index.tsx index 9c080c966791..02830178d010 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconLightMode/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/LightMode/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconLightMode'; +import type {Props} from '@theme/Icon/LightMode'; export default function IconLightMode(props: Props): JSX.Element { return ( diff --git a/packages/docusaurus-theme-classic/src/theme/IconMenu/index.tsx b/packages/docusaurus-theme-classic/src/theme/Icon/Menu/index.tsx similarity index 93% rename from packages/docusaurus-theme-classic/src/theme/IconMenu/index.tsx rename to packages/docusaurus-theme-classic/src/theme/Icon/Menu/index.tsx index d1c4e8cdf2b4..4e110d1c5548 100644 --- a/packages/docusaurus-theme-classic/src/theme/IconMenu/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Icon/Menu/index.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import type {Props} from '@theme/IconMenu'; +import type {Props} from '@theme/Icon/Menu'; export default function IconMenu({ width = 30, diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx index ed08c5375010..dfaaee227fa6 100644 --- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx @@ -8,7 +8,7 @@ import React from 'react'; import {useNavbarMobileSidebar} from '@docusaurus/theme-common/internal'; import NavbarColorModeToggle from '@theme/Navbar/ColorModeToggle'; -import IconClose from '@theme/IconClose'; +import IconClose from '@theme/Icon/Close'; import NavbarLogo from '@theme/Navbar/Logo'; function CloseButton() { diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx index 537680caeded..a35d1d08d972 100644 --- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; import {useNavbarMobileSidebar} from '@docusaurus/theme-common/internal'; -import IconMenu from '@theme/IconMenu'; +import IconMenu from '@theme/Icon/Menu'; export default function MobileSidebarToggle(): JSX.Element { const mobileSidebar = useNavbarMobileSidebar(); diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx index 3a6022c87e3d..f91ef9eb9d87 100644 --- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx +++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx @@ -10,7 +10,7 @@ import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import {useAlternatePageUtils} from '@docusaurus/theme-common/internal'; import {translate} from '@docusaurus/Translate'; import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem'; -import IconLanguage from '@theme/IconLanguage'; +import IconLanguage from '@theme/Icon/Language'; import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem'; import type {Props} from '@theme/NavbarItem/LocaleDropdownNavbarItem'; diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx index 050c6ed5c7f7..8e22a938f00f 100644 --- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx +++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx @@ -10,7 +10,7 @@ import Link from '@docusaurus/Link'; import useBaseUrl from '@docusaurus/useBaseUrl'; import isInternalUrl from '@docusaurus/isInternalUrl'; import {isRegexpStringMatch} from '@docusaurus/theme-common'; -import IconExternalLink from '@theme/IconExternalLink'; +import IconExternalLink from '@theme/Icon/ExternalLink'; import type {Props} from '@theme/NavbarItem/NavbarNavLink'; export default function NavbarNavLink({ diff --git a/website/src/plugins/changelog/theme/ChangelogItem/Header/Authors/index.tsx b/website/src/plugins/changelog/theme/ChangelogItem/Header/Authors/index.tsx index fd52f8d18e72..a14046507f5d 100644 --- a/website/src/plugins/changelog/theme/ChangelogItem/Header/Authors/index.tsx +++ b/website/src/plugins/changelog/theme/ChangelogItem/Header/Authors/index.tsx @@ -9,7 +9,7 @@ import React, {useState} from 'react'; import clsx from 'clsx'; import {useBlogPost} from '@docusaurus/theme-common/internal'; import BlogPostItemHeaderAuthor from '@theme/BlogPostItem/Header/Author'; -import IconExpand from '@theme/IconExpand'; +import IconExpand from '@theme/Icon/Expand'; import type {Props} from '@theme/BlogPostItem/Header/Authors'; import styles from './styles.module.css'; diff --git a/website/src/plugins/changelog/theme/IconExpand/index.tsx b/website/src/plugins/changelog/theme/Icon/Expand/index.tsx similarity index 97% rename from website/src/plugins/changelog/theme/IconExpand/index.tsx rename to website/src/plugins/changelog/theme/Icon/Expand/index.tsx index cf2c7e4eee25..0326367a6f5b 100644 --- a/website/src/plugins/changelog/theme/IconExpand/index.tsx +++ b/website/src/plugins/changelog/theme/Icon/Expand/index.tsx @@ -7,7 +7,7 @@ import React from 'react'; -import type {Props} from '@theme/IconExpand'; +import type {Props} from '@theme/Icon/Expand'; export default function IconExpand({expanded, ...props}: Props): JSX.Element { if (expanded) { diff --git a/website/src/plugins/changelog/theme/types.d.ts b/website/src/plugins/changelog/theme/types.d.ts index 4ac3776e3404..f6af8075f217 100644 --- a/website/src/plugins/changelog/theme/types.d.ts +++ b/website/src/plugins/changelog/theme/types.d.ts @@ -15,7 +15,7 @@ declare module '@theme/ChangelogItem/Header/Authors'; declare module '@theme/ChangelogList'; declare module '@theme/ChangelogList/Header'; -declare module '@theme/IconExpand' { +declare module '@theme/Icon/Expand' { import type {ComponentProps} from 'react'; export interface Props extends ComponentProps<'svg'> { From b03519d296970a3350dfd377c6c37d9e943c1190 Mon Sep 17 00:00:00 2001 From: sebastienlorber Date: Fri, 8 Jul 2022 15:14:14 +0200 Subject: [PATCH 2/2] fix swizzle config --- .../docusaurus-theme-classic/src/getSwizzleConfig.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts b/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts index a0549256e98f..72356f78e7c7 100644 --- a/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts +++ b/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts @@ -93,35 +93,35 @@ export default function getSwizzleConfig(): SwizzleConfig { }, description: 'The footer logo', }, - IconArrow: { + 'Icon/Arrow': { actions: { eject: 'safe', wrap: 'safe', }, description: 'The arrow icon component', }, - IconDarkMode: { + 'Icon/DarkMode': { actions: { eject: 'safe', wrap: 'safe', }, description: 'The dark mode icon component.', }, - IconEdit: { + 'Icon/Edit': { actions: { eject: 'safe', wrap: 'safe', }, description: 'The edit icon component', }, - IconLightMode: { + 'Icon/LightMode': { actions: { eject: 'safe', wrap: 'safe', }, description: 'The light mode icon component.', }, - IconMenu: { + 'Icon/Menu': { actions: { eject: 'safe', wrap: 'safe',