@docusaurus/theme-classic 4.0.0-canary-6952 → 4.0.0-canary-6958

package/lib/getSwizzleConfig.js

@@ -143,7 +143,7 @@ function getSwizzleConfig() {
                     eject: 'unsafe',
                     wrap: 'unsafe',
                 },
-                description: 'The folder containing components responsible for rendering different types of CodeBlock content.',
+                description: 'The component responsible for rendering the syntax-highlighted code lines of a CodeBlock.',
             },
             ColorModeToggle: {
                 actions: {

package/lib/options.js

@@ -260,9 +260,6 @@ const ColorModeSchema = utils_validation_1.Joi.object({
         .default(DEFAULT_COLOR_MODE_CONFIG.defaultMode),
     disableSwitch: utils_validation_1.Joi.bool().default(DEFAULT_COLOR_MODE_CONFIG.disableSwitch),
     respectPrefersColorScheme: utils_validation_1.Joi.bool().default(DEFAULT_COLOR_MODE_CONFIG.respectPrefersColorScheme),
-    switchConfig: utils_validation_1.Joi.any().forbidden().messages({
-        'any.unknown': 'colorMode.switchConfig is deprecated. If you want to customize the icons for light and dark mode, swizzle IconLightMode, IconDarkMode, or ColorModeToggle instead.',
-    }),
 }).default(DEFAULT_COLOR_MODE_CONFIG);
 const HtmlMetadataSchema = utils_validation_1.Joi.object({
     id: utils_validation_1.Joi.string(),
@@ -305,15 +302,6 @@ const LogoSchema = utils_validation_1.Joi.object({
 // See https://github.com/facebook/docusaurus/issues/9012
 const PrismLanguage = utils_validation_1.Joi.string().custom((val) => val.toLowerCase());
 exports.ThemeConfigSchema = utils_validation_1.Joi.object({
-    // TODO temporary (@alpha-58)
-    // @ts-expect-error: forbidden
-    disableDarkMode: utils_validation_1.Joi.any().forbidden().messages({
-        'any.unknown': 'disableDarkMode theme config is deprecated. Please use the new colorMode attribute. You likely want: config.themeConfig.colorMode.disableSwitch = true',
-    }),
-    // TODO temporary (@alpha-58)
-    defaultDarkMode: utils_validation_1.Joi.any().forbidden().messages({
-        'any.unknown': 'defaultDarkMode theme config is deprecated. Please use the new colorMode attribute. You likely want: config.themeConfig.colorMode.defaultMode = "dark"',
-    }),
     colorMode: ColorModeSchema,
     image: utils_validation_1.Joi.string(),
     docs: DocsSchema,
@@ -321,12 +309,6 @@ exports.ThemeConfigSchema = utils_validation_1.Joi.object({
     metadata: utils_validation_1.Joi.array()
         .items(HtmlMetadataSchema)
         .default(exports.DEFAULT_CONFIG.metadata),
-    // cSpell:ignore metadatas
-    metadatas: utils_validation_1.Joi.any().forbidden().messages({
-        'any.unknown': 
-        // cSpell:ignore metadatas
-        'themeConfig.metadatas has been renamed as themeConfig.metadata. See https://github.com/facebook/docusaurus/pull/5871',
-    }),
     announcementBar: utils_validation_1.Joi.object({
         id: utils_validation_1.Joi.string().default('announcement-bar'),
         content: utils_validation_1.Joi.string().required(),
@@ -337,10 +319,6 @@ exports.ThemeConfigSchema = utils_validation_1.Joi.object({
     navbar: utils_validation_1.Joi.object({
         style: utils_validation_1.Joi.string().equal('dark', 'primary'),
         hideOnScroll: utils_validation_1.Joi.bool().default(exports.DEFAULT_CONFIG.navbar.hideOnScroll),
-        // TODO temporary (@alpha-58)
-        links: utils_validation_1.Joi.any().forbidden().messages({
-            'any.unknown': 'themeConfig.navbar.links has been renamed as themeConfig.navbar.items',
-        }),
         items: utils_validation_1.Joi.array()
             .items(NavbarItemSchema)
             .default(exports.DEFAULT_CONFIG.navbar.items),
@@ -383,15 +361,6 @@ exports.ThemeConfigSchema = utils_validation_1.Joi.object({
     })
         .default(exports.DEFAULT_CONFIG.prism)
         .unknown(),
-    hideableSidebar: utils_validation_1.Joi.forbidden().messages({
-        'any.unknown': 'themeConfig.hideableSidebar has been moved to themeConfig.docs.sidebar.hideable.',
-    }),
-    autoCollapseSidebarCategories: utils_validation_1.Joi.forbidden().messages({
-        'any.unknown': 'themeConfig.autoCollapseSidebarCategories has been moved to themeConfig.docs.sidebar.autoCollapseCategories.',
-    }),
-    sidebarCollapsible: utils_validation_1.Joi.forbidden().messages({
-        'any.unknown': 'The themeConfig.sidebarCollapsible has been moved to docs plugin options. See: https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-content-docs',
-    }),
     tableOfContents: utils_validation_1.Joi.object({
         minHeadingLevel: utils_validation_1.Joi.number()
             .default(exports.DEFAULT_CONFIG.tableOfContents.minHeadingLevel)

package/lib/theme/Blog/Pages/BlogAuthorsListPage/index.js

@@ -10,7 +10,7 @@ import {
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
-import {translateBlogAuthorsListPageTitle} from '@docusaurus/theme-common/internal';
+import {translateBlogAuthorsListPageTitle} from '@docusaurus/plugin-content-blog/client';
 import BlogLayout from '@theme/BlogLayout';
 import SearchMetadata from '@theme/SearchMetadata';
 import Heading from '@theme/Heading';

package/lib/theme/Blog/Pages/BlogAuthorsPostsPage/index.js

@@ -10,13 +10,13 @@ import {
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
+import Link from '@docusaurus/Link';
 import {
+  useBlogMetadata,
   useBlogAuthorPageTitle,
   BlogAuthorsListViewAllLabel,
   BlogAuthorNoPostsLabel,
-} from '@docusaurus/theme-common/internal';
-import Link from '@docusaurus/Link';
-import {useBlogMetadata} from '@docusaurus/plugin-content-blog/client';
+} from '@docusaurus/plugin-content-blog/client';
 import BlogLayout from '@theme/BlogLayout';
 import BlogListPaginator from '@theme/BlogListPaginator';
 import SearchMetadata from '@theme/SearchMetadata';

package/lib/theme/BlogTagsPostsPage/index.js

@@ -11,7 +11,7 @@ import {
   TagsPageLinkLabel,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
-import {useBlogTagsPostsPageTitle} from '@docusaurus/theme-common/internal';
+import {useBlogTagsPostsPageTitle} from '@docusaurus/plugin-content-blog/client';
 import Link from '@docusaurus/Link';
 import BlogLayout from '@theme/BlogLayout';
 import BlogListPaginator from '@theme/BlogListPaginator';

package/lib/theme/CodeBlock/Content/styles.module.css

@@ -11,10 +11,6 @@
   padding: 0;
 }
 
-.codeBlockStandalone {
-  padding: 0;
-}
-
 .codeBlockLines {
   font: inherit;
   /* rtl:ignore */

package/lib/theme/CodeBlock/{Content/Element.d.ts → Element/index.d.ts}

@@ -5,5 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { ReactNode } from 'react';
-import type { Props } from '@theme/CodeBlock/Content/Element';
-export default function CodeBlockJSX({ children, className }: Props): ReactNode;
+import type { Props } from '@theme/CodeBlock/Element';
+export default function CodeBlockElement({ children, className, }: Props): ReactNode;

package/lib/theme/CodeBlock/{Content/Element.js → Element/index.js}

@@ -7,12 +7,11 @@
 import clsx from 'clsx';
 import Container from '@theme/CodeBlock/Container';
 import styles from './styles.module.css';
-// TODO Docusaurus v4: move this component at the root?
 // This component only handles a rare edge-case: <pre><MyComp/></pre> in MDX
 // <pre> tags in markdown map to CodeBlocks. They may contain JSX children.
 // When children is not a simple string, we just return a styled block without
 // actually highlighting.
-export default function CodeBlockJSX({children, className}) {
+export default function CodeBlockElement({children, className}) {
   return (
     <Container
       as="pre"

package/lib/theme/CodeBlock/Element/styles.module.css

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+.codeBlockStandalone {
+  padding: 0;
+}
+
+.codeBlockLines {
+  font: inherit;
+  /* rtl:ignore */
+  float: left;
+  min-width: 100%;
+  padding: var(--ifm-pre-padding);
+}
+
+@media print {
+  .codeBlockLines {
+    white-space: pre-wrap;
+  }
+}

package/lib/theme/CodeBlock/{Content/String.d.ts → String/index.d.ts}

@@ -5,5 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { ReactNode } from 'react';
-import type { Props } from '@theme/CodeBlock/Content/String';
+import type { Props } from '@theme/CodeBlock/String';
 export default function CodeBlockString(props: Props): ReactNode;

package/lib/theme/CodeBlock/{Content/String.js → String/index.js}

@@ -24,7 +24,6 @@ function useCodeBlockMetadata(props) {
     showLineNumbers: props.showLineNumbers,
   });
 }
-// TODO Docusaurus v4: move this component at the root?
 export default function CodeBlockString(props) {
   const metadata = useCodeBlockMetadata(props);
   const wordWrap = useCodeWordWrap();

package/lib/theme/CodeBlock/index.js

@@ -6,8 +6,8 @@
  */
 import React, {isValidElement} from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
-import ElementContent from '@theme/CodeBlock/Content/Element';
-import StringContent from '@theme/CodeBlock/Content/String';
+import CodeBlockElement from '@theme/CodeBlock/Element';
+import CodeBlockString from '@theme/CodeBlock/String';
 /**
  * Best attempt to make the children a plain string so it is copyable. If there
  * are react elements, we will not be able to copy the content, and it will
@@ -29,7 +29,7 @@ export default function CodeBlock({children: rawChildren, ...props}) {
   const isBrowser = useIsBrowser();
   const children = maybeStringifyChildren(rawChildren);
   const CodeBlockComp =
-    typeof children === 'string' ? StringContent : ElementContent;
+    typeof children === 'string' ? CodeBlockString : CodeBlockElement;
   return (
     <CodeBlockComp key={String(isBrowser)} {...props}>
       {children}

package/lib/theme/DocCard/index.js

@@ -7,11 +7,9 @@
 import {
   useDocById,
   findFirstSidebarItemLink,
-} from '@docusaurus/plugin-content-docs/client';
-import {
-  extractLeadingEmoji,
   useDocCardDescriptionCategoryItemsPlural,
-} from '@docusaurus/theme-common/internal';
+} from '@docusaurus/plugin-content-docs/client';
+import {extractLeadingEmoji} from '@docusaurus/theme-common/internal';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import Layout from '@theme/DocCard/Layout';
 function getFallbackEmojiIcon(item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "4.0.0-canary-6952",
+  "version": "4.0.0-canary-6958",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -14,18 +14,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "4.0.0-canary-6952",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6952",
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6952",
-    "@docusaurus/plugin-content-blog": "4.0.0-canary-6952",
-    "@docusaurus/plugin-content-docs": "4.0.0-canary-6952",
-    "@docusaurus/plugin-content-pages": "4.0.0-canary-6952",
-    "@docusaurus/theme-common": "4.0.0-canary-6952",
-    "@docusaurus/theme-translations": "4.0.0-canary-6952",
-    "@docusaurus/types": "4.0.0-canary-6952",
-    "@docusaurus/utils": "4.0.0-canary-6952",
-    "@docusaurus/utils-common": "4.0.0-canary-6952",
-    "@docusaurus/utils-validation": "4.0.0-canary-6952",
+    "@docusaurus/core": "4.0.0-canary-6958",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6958",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6958",
+    "@docusaurus/plugin-content-blog": "4.0.0-canary-6958",
+    "@docusaurus/plugin-content-docs": "4.0.0-canary-6958",
+    "@docusaurus/plugin-content-pages": "4.0.0-canary-6958",
+    "@docusaurus/theme-common": "4.0.0-canary-6958",
+    "@docusaurus/theme-translations": "4.0.0-canary-6958",
+    "@docusaurus/types": "4.0.0-canary-6958",
+    "@docusaurus/utils": "4.0.0-canary-6958",
+    "@docusaurus/utils-common": "4.0.0-canary-6958",
+    "@docusaurus/utils-validation": "4.0.0-canary-6958",
     "@mdx-js/react": "^3.1.1",
     "clsx": "^2.1.1",
     "copy-text-to-clipboard": "^3.2.2",

package/src/getSwizzleConfig.ts

@@ -154,7 +154,7 @@ export default function getSwizzleConfig(): SwizzleConfig {
           wrap: 'unsafe',
         },
         description:
-          'The folder containing components responsible for rendering different types of CodeBlock content.',
+          'The component responsible for rendering the syntax-highlighted code lines of a CodeBlock.',
       },
       ColorModeToggle: {
         actions: {

package/src/options.ts

@@ -304,10 +304,6 @@ const ColorModeSchema = Joi.object({
   respectPrefersColorScheme: Joi.bool().default(
     DEFAULT_COLOR_MODE_CONFIG.respectPrefersColorScheme,
   ),
-  switchConfig: Joi.any().forbidden().messages({
-    'any.unknown':
-      'colorMode.switchConfig is deprecated. If you want to customize the icons for light and dark mode, swizzle IconLightMode, IconDarkMode, or ColorModeToggle instead.',
-  }),
 }).default(DEFAULT_COLOR_MODE_CONFIG);
 
 const HtmlMetadataSchema = Joi.object({
@@ -356,17 +352,6 @@ const LogoSchema = Joi.object({
 const PrismLanguage = Joi.string().custom((val) => val.toLowerCase());
 
 export const ThemeConfigSchema = Joi.object<ThemeConfig>({
-  // TODO temporary (@alpha-58)
-  // @ts-expect-error: forbidden
-  disableDarkMode: Joi.any().forbidden().messages({
-    'any.unknown':
-      'disableDarkMode theme config is deprecated. Please use the new colorMode attribute. You likely want: config.themeConfig.colorMode.disableSwitch = true',
-  }),
-  // TODO temporary (@alpha-58)
-  defaultDarkMode: Joi.any().forbidden().messages({
-    'any.unknown':
-      'defaultDarkMode theme config is deprecated. Please use the new colorMode attribute. You likely want: config.themeConfig.colorMode.defaultMode = "dark"',
-  }),
   colorMode: ColorModeSchema,
   image: Joi.string(),
   docs: DocsSchema,
@@ -374,12 +359,6 @@ export const ThemeConfigSchema = Joi.object<ThemeConfig>({
   metadata: Joi.array()
     .items(HtmlMetadataSchema)
     .default(DEFAULT_CONFIG.metadata),
-  // cSpell:ignore metadatas
-  metadatas: Joi.any().forbidden().messages({
-    'any.unknown':
-      // cSpell:ignore metadatas
-      'themeConfig.metadatas has been renamed as themeConfig.metadata. See https://github.com/facebook/docusaurus/pull/5871',
-  }),
   announcementBar: Joi.object({
     id: Joi.string().default('announcement-bar'),
     content: Joi.string().required(),
@@ -390,11 +369,6 @@ export const ThemeConfigSchema = Joi.object<ThemeConfig>({
   navbar: Joi.object({
     style: Joi.string().equal('dark', 'primary'),
     hideOnScroll: Joi.bool().default(DEFAULT_CONFIG.navbar.hideOnScroll),
-    // TODO temporary (@alpha-58)
-    links: Joi.any().forbidden().messages({
-      'any.unknown':
-        'themeConfig.navbar.links has been renamed as themeConfig.navbar.items',
-    }),
     items: Joi.array()
       .items(NavbarItemSchema)
       .default(DEFAULT_CONFIG.navbar.items),
@@ -442,18 +416,6 @@ export const ThemeConfigSchema = Joi.object<ThemeConfig>({
   })
     .default(DEFAULT_CONFIG.prism)
     .unknown(),
-  hideableSidebar: Joi.forbidden().messages({
-    'any.unknown':
-      'themeConfig.hideableSidebar has been moved to themeConfig.docs.sidebar.hideable.',
-  }),
-  autoCollapseSidebarCategories: Joi.forbidden().messages({
-    'any.unknown':
-      'themeConfig.autoCollapseSidebarCategories has been moved to themeConfig.docs.sidebar.autoCollapseCategories.',
-  }),
-  sidebarCollapsible: Joi.forbidden().messages({
-    'any.unknown':
-      'The themeConfig.sidebarCollapsible has been moved to docs plugin options. See: https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-content-docs',
-  }),
   tableOfContents: Joi.object({
     minHeadingLevel: Joi.number()
       .default(DEFAULT_CONFIG.tableOfContents.minHeadingLevel)

package/src/theme/Blog/Pages/BlogAuthorsListPage/index.tsx

@@ -12,7 +12,7 @@ import {
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
-import {translateBlogAuthorsListPageTitle} from '@docusaurus/theme-common/internal';
+import {translateBlogAuthorsListPageTitle} from '@docusaurus/plugin-content-blog/client';
 import BlogLayout from '@theme/BlogLayout';
 import type {Props} from '@theme/Blog/Pages/BlogAuthorsListPage';
 import SearchMetadata from '@theme/SearchMetadata';

package/src/theme/Blog/Pages/BlogAuthorsPostsPage/index.tsx

@@ -12,13 +12,13 @@ import {
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
+import Link from '@docusaurus/Link';
 import {
+  useBlogMetadata,
   useBlogAuthorPageTitle,
   BlogAuthorsListViewAllLabel,
   BlogAuthorNoPostsLabel,
-} from '@docusaurus/theme-common/internal';
-import Link from '@docusaurus/Link';
-import {useBlogMetadata} from '@docusaurus/plugin-content-blog/client';
+} from '@docusaurus/plugin-content-blog/client';
 import BlogLayout from '@theme/BlogLayout';
 import BlogListPaginator from '@theme/BlogListPaginator';
 import SearchMetadata from '@theme/SearchMetadata';

package/src/theme/BlogTagsPostsPage/index.tsx

@@ -13,7 +13,7 @@ import {
   TagsPageLinkLabel,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
-import {useBlogTagsPostsPageTitle} from '@docusaurus/theme-common/internal';
+import {useBlogTagsPostsPageTitle} from '@docusaurus/plugin-content-blog/client';
 import Link from '@docusaurus/Link';
 import BlogLayout from '@theme/BlogLayout';
 import BlogListPaginator from '@theme/BlogListPaginator';

package/src/theme/CodeBlock/Content/styles.module.css

@@ -11,10 +11,6 @@
   padding: 0;
 }
 
-.codeBlockStandalone {
-  padding: 0;
-}
-
 .codeBlockLines {
   font: inherit;
   /* rtl:ignore */

package/src/theme/CodeBlock/{Content/Element.tsx → Element/index.tsx}

@@ -8,16 +8,18 @@
 import type {ReactNode} from 'react';
 import clsx from 'clsx';
 import Container from '@theme/CodeBlock/Container';
-import type {Props} from '@theme/CodeBlock/Content/Element';
+import type {Props} from '@theme/CodeBlock/Element';
 
 import styles from './styles.module.css';
 
-// TODO Docusaurus v4: move this component at the root?
 // This component only handles a rare edge-case: <pre><MyComp/></pre> in MDX
 // <pre> tags in markdown map to CodeBlocks. They may contain JSX children.
 // When children is not a simple string, we just return a styled block without
 // actually highlighting.
-export default function CodeBlockJSX({children, className}: Props): ReactNode {
+export default function CodeBlockElement({
+  children,
+  className,
+}: Props): ReactNode {
   return (
     <Container
       as="pre"

package/src/theme/CodeBlock/Element/styles.module.css

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+.codeBlockStandalone {
+  padding: 0;
+}
+
+.codeBlockLines {
+  font: inherit;
+  /* rtl:ignore */
+  float: left;
+  min-width: 100%;
+  padding: var(--ifm-pre-padding);
+}
+
+@media print {
+  .codeBlockLines {
+    white-space: pre-wrap;
+  }
+}

package/src/theme/CodeBlock/{Content/String.tsx → String/index.tsx}

@@ -13,7 +13,7 @@ import {
   createCodeBlockMetadata,
   useCodeWordWrap,
 } from '@docusaurus/theme-common/internal';
-import type {Props} from '@theme/CodeBlock/Content/String';
+import type {Props} from '@theme/CodeBlock/String';
 import CodeBlockLayout from '@theme/CodeBlock/Layout';
 
 function useCodeBlockMetadata(props: Props): CodeBlockMetadata {
@@ -30,7 +30,6 @@ function useCodeBlockMetadata(props: Props): CodeBlockMetadata {
   });
 }
 
-// TODO Docusaurus v4: move this component at the root?
 export default function CodeBlockString(props: Props): ReactNode {
   const metadata = useCodeBlockMetadata(props);
   const wordWrap = useCodeWordWrap();

package/src/theme/CodeBlock/index.tsx

@@ -7,8 +7,8 @@
 
 import React, {isValidElement, type ReactNode} from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
-import ElementContent from '@theme/CodeBlock/Content/Element';
-import StringContent from '@theme/CodeBlock/Content/String';
+import CodeBlockElement from '@theme/CodeBlock/Element';
+import CodeBlockString from '@theme/CodeBlock/String';
 import type {Props} from '@theme/CodeBlock';
 
 /**
@@ -36,7 +36,7 @@ export default function CodeBlock({
   const isBrowser = useIsBrowser();
   const children = maybeStringifyChildren(rawChildren);
   const CodeBlockComp =
-    typeof children === 'string' ? StringContent : ElementContent;
+    typeof children === 'string' ? CodeBlockString : CodeBlockElement;
   return (
     <CodeBlockComp key={String(isBrowser)} {...props}>
       {children as string}

package/src/theme/DocCard/index.tsx

@@ -9,11 +9,9 @@ import type {ReactNode} from 'react';
 import {
   useDocById,
   findFirstSidebarItemLink,
-} from '@docusaurus/plugin-content-docs/client';
-import {
-  extractLeadingEmoji,
   useDocCardDescriptionCategoryItemsPlural,
-} from '@docusaurus/theme-common/internal';
+} from '@docusaurus/plugin-content-docs/client';
+import {extractLeadingEmoji} from '@docusaurus/theme-common/internal';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import Layout from '@theme/DocCard/Layout';
 

package/src/theme-classic.d.ts

@@ -507,16 +507,16 @@ declare module '@theme/CodeBlock/Content' {
   export default function CodeBlockContent(props: Props): ReactNode;
 }
 
-declare module '@theme/CodeBlock/Content/Element' {
+declare module '@theme/CodeBlock/Element' {
   import type {ReactNode} from 'react';
   import type {Props} from '@theme/CodeBlock';
 
   export type {Props};
 
-  export default function CodeBlockContentElement(props: Props): ReactNode;
+  export default function CodeBlockElement(props: Props): ReactNode;
 }
 
-declare module '@theme/CodeBlock/Content/String' {
+declare module '@theme/CodeBlock/String' {
   import type {ReactNode} from 'react';
   import type {Props as CodeBlockProps} from '@theme/CodeBlock';
 
@@ -524,7 +524,7 @@ declare module '@theme/CodeBlock/Content/String' {
     readonly children: string;
   }
 
-  export default function CodeBlockContentString(props: Props): ReactNode;
+  export default function CodeBlockString(props: Props): ReactNode;
 }
 
 declare module '@theme/CodeBlock/Line' {