@docusaurus/theme-classic 0.0.0-4342 → 0.0.0-4351

package/lib/theme-classic.d.ts

@@ -107,13 +107,14 @@ declare module '@theme/BlogLayout' {
 }
 
 declare module '@theme/CodeBlock' {
-  import {ReactElement} from 'react';
+  import type {ReactElement} from 'react';
 
   export interface Props {
     readonly children: string | ReactElement;
     readonly className?: string;
     readonly metastring?: string;
     readonly title?: string;
+    readonly language?: string;
   }
 
   const CodeBlock: (props: Props) => JSX.Element;
@@ -181,7 +182,7 @@ declare module '@theme/EditThisPage' {
 }
 
 declare module '@theme/ErrorPageContent' {
-  import ErrorComponent from '@theme/Error';
+  import type ErrorComponent from '@theme/Error';
 
   const ErrorPageContent: typeof ErrorComponent;
   export default ErrorPageContent;
@@ -219,7 +220,7 @@ declare module '@theme/hooks/useLockBodyScroll' {
 }
 
 declare module '@theme/hooks/usePrismTheme' {
-  import defaultTheme from 'prism-react-renderer/themes/palenight';
+  import type defaultTheme from 'prism-react-renderer/themes/palenight';
 
   const usePrismTheme: () => typeof defaultTheme;
   export default usePrismTheme;
@@ -581,7 +582,7 @@ declare module '@theme/ThemedImage' {
 }
 
 declare module '@theme/Details' {
-  import {Details, DetailsProps} from '@docusaurus/theme-common';
+  import {Details, type DetailsProps} from '@docusaurus/theme-common';
 
   export interface Props extends DetailsProps {}
   export default Details;

package/lib-next/theme/CodeBlock/index.js

@@ -20,9 +20,10 @@ import usePrismTheme from '@theme/hooks/usePrismTheme';
 import styles from './styles.module.css';
 export default function CodeBlock({
   children,
-  className: blockClassName,
+  className: blockClassName = '',
   metastring,
   title,
+  language: languageProp,
 }) {
   const {prism} = useThemeConfig();
   const [showCopied, setShowCopied] = useState(false);
@@ -73,7 +74,8 @@ export default function CodeBlock({
   } // The children is now guaranteed to be one/more plain strings
 
   const content = Array.isArray(children) ? children.join('') : children;
-  const language = parseLanguage(blockClassName) ?? prism.defaultLanguage;
+  const language =
+    languageProp ?? parseLanguage(blockClassName) ?? prism.defaultLanguage;
   const {highlightLines, code} = parseLines(content, metastring, language);
 
   const handleCopyCode = () => {
@@ -94,6 +96,10 @@ export default function CodeBlock({
           className={clsx(
             styles.codeBlockContainer,
             blockClassName,
+            {
+              [`language-${language}`]:
+                language && !blockClassName.includes(`language-${language}`),
+            },
             ThemeClassNames.common.codeBlock,
           )}>
           {codeBlockTitle && (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-4342",
+  "version": "0.0.0-4351",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -23,14 +23,14 @@
     "update-code-translations": "node -e 'require(\"./update-code-translations.js\").run()'"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4342",
-    "@docusaurus/plugin-content-blog": "0.0.0-4342",
-    "@docusaurus/plugin-content-docs": "0.0.0-4342",
-    "@docusaurus/plugin-content-pages": "0.0.0-4342",
-    "@docusaurus/theme-common": "0.0.0-4342",
-    "@docusaurus/theme-translations": "0.0.0-4342",
-    "@docusaurus/utils": "0.0.0-4342",
-    "@docusaurus/utils-validation": "0.0.0-4342",
+    "@docusaurus/core": "0.0.0-4351",
+    "@docusaurus/plugin-content-blog": "0.0.0-4351",
+    "@docusaurus/plugin-content-docs": "0.0.0-4351",
+    "@docusaurus/plugin-content-pages": "0.0.0-4351",
+    "@docusaurus/theme-common": "0.0.0-4351",
+    "@docusaurus/theme-translations": "0.0.0-4351",
+    "@docusaurus/utils": "0.0.0-4351",
+    "@docusaurus/utils-validation": "0.0.0-4351",
     "@mdx-js/mdx": "^1.6.21",
     "@mdx-js/react": "^1.6.21",
     "clsx": "^1.1.1",
@@ -45,8 +45,8 @@
     "rtlcss": "^3.3.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4342",
-    "@docusaurus/types": "0.0.0-4342",
+    "@docusaurus/module-type-aliases": "0.0.0-4351",
+    "@docusaurus/types": "0.0.0-4351",
     "@types/mdx-js__react": "^1.5.4",
     "@types/parse-numeric-range": "^0.0.1",
     "@types/rtlcss": "^3.1.1",
@@ -61,5 +61,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "e9ef727d5f5fefa96d92ad98fa61f3e3e961dd1d"
+  "gitHead": "6633ee41d0b5c670e9e4c18fb6ddd9c8bb05a41b"
 }

package/src/index.ts

@@ -5,7 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {DocusaurusContext, Plugin, PostCssOptions} from '@docusaurus/types';
+import type {
+  DocusaurusContext,
+  Plugin,
+  PostCssOptions,
+} from '@docusaurus/types';
 import type {ThemeConfig} from '@docusaurus/theme-common';
 import {getTranslationFiles, translateThemeConfig} from './translations';
 import path from 'path';

package/src/theme/Admonition/index.tsx

@@ -7,7 +7,7 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import {Props} from '@theme/Admonition';
+import type {Props} from '@theme/Admonition';
 
 const icons = {
   note: (

package/src/theme/CodeBlock/index.tsx

@@ -7,7 +7,7 @@
 
 import React, {isValidElement, useEffect, useState} from 'react';
 import clsx from 'clsx';
-import Highlight, {defaultProps, Language} from 'prism-react-renderer';
+import Highlight, {defaultProps, type Language} from 'prism-react-renderer';
 import copy from 'copy-text-to-clipboard';
 import Translate, {translate} from '@docusaurus/Translate';
 import {
@@ -24,9 +24,10 @@ import styles from './styles.module.css';
 
 export default function CodeBlock({
   children,
-  className: blockClassName,
+  className: blockClassName = '',
   metastring,
   title,
+  language: languageProp,
 }: Props): JSX.Element {
   const {prism} = useThemeConfig();
 
@@ -85,8 +86,7 @@ export default function CodeBlock({
     : (children as string);
 
   const language =
-    parseLanguage(blockClassName) ??
-    (prism.defaultLanguage as Language | undefined);
+    languageProp ?? parseLanguage(blockClassName) ?? prism.defaultLanguage;
   const {highlightLines, code} = parseLines(content, metastring, language);
 
   const handleCopyCode = () => {
@@ -102,12 +102,16 @@ export default function CodeBlock({
       key={String(mounted)}
       theme={prismTheme}
       code={code}
-      language={language ?? ('text' as Language)}>
+      language={(language ?? 'text') as Language}>
       {({className, style, tokens, getLineProps, getTokenProps}) => (
         <div
           className={clsx(
             styles.codeBlockContainer,
             blockClassName,
+            {
+              [`language-${language}`]:
+                language && !blockClassName.includes(`language-${language}`),
+            },
             ThemeClassNames.common.codeBlock,
           )}>
           {codeBlockTitle && (

package/src/theme/DocCard/index.tsx

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {ReactNode} from 'react';
+import React, {type ReactNode} from 'react';
 import Link from '@docusaurus/Link';
-import {
+import type {
   PropSidebarItemCategory,
   PropSidebarItemLink,
 } from '@docusaurus/plugin-content-docs';

package/src/theme/DocCardList/index.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 
 import DocCard from '@theme/DocCard';
-import {PropSidebarItem} from '@docusaurus/plugin-content-docs';
+import type {PropSidebarItem} from '@docusaurus/plugin-content-docs';
 
 export default function DocCardList({
   items,

package/src/theme/DocItemFooter/index.tsx

@@ -12,7 +12,7 @@ import LastUpdated from '@theme/LastUpdated';
 import type {Props} from '@theme/DocItem';
 import EditThisPage from '@theme/EditThisPage';
 import TagsListInline, {
-  Props as TagsListInlineProps,
+  type Props as TagsListInlineProps,
 } from '@theme/TagsListInline';
 
 import styles from './styles.module.css';

package/src/theme/DocPage/index.tsx

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {ReactNode, useState, useCallback} from 'react';
+import React, {type ReactNode, useState, useCallback} from 'react';
 import {MDXProvider} from '@mdx-js/react';
 
 import renderRoutes from '@docusaurus/renderRoutes';

package/src/theme/DocSidebar/index.tsx

@@ -11,7 +11,7 @@ import {
   useThemeConfig,
   useAnnouncementBar,
   MobileSecondaryMenuFiller,
-  MobileSecondaryMenuComponent,
+  type MobileSecondaryMenuComponent,
   ThemeClassNames,
   useScrollPosition,
 } from '@docusaurus/theme-common';

package/src/theme/DocVersionBanner/index.tsx

@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {ComponentType} from 'react';
+import React, {type ComponentType} from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Link from '@docusaurus/Link';
 import Translate from '@docusaurus/Translate';
 import {
   useActivePlugin,
   useDocVersionSuggestions,
-  GlobalVersion,
+  type GlobalVersion,
 } from '@theme/hooks/useDocs';
 import {
   ThemeClassNames,

package/src/theme/Footer/index.tsx

@@ -10,15 +10,15 @@ import clsx from 'clsx';
 
 import Link from '@docusaurus/Link';
 import {
-  FooterLinkItem,
+  type FooterLinkItem,
   useThemeConfig,
-  MultiColumnFooter,
-  SimpleFooter,
+  type MultiColumnFooter,
+  type SimpleFooter,
 } from '@docusaurus/theme-common';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import styles from './styles.module.css';
-import ThemedImage, {Props as ThemedImageProps} from '@theme/ThemedImage';
+import ThemedImage, {type Props as ThemedImageProps} from '@theme/ThemedImage';
 import IconExternalLink from '@theme/IconExternalLink';
 
 function FooterLink({

package/src/theme/MDXComponents/index.tsx

@@ -5,7 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {ComponentProps, isValidElement, ReactElement} from 'react';
+import React, {
+  type ComponentProps,
+  isValidElement,
+  type ReactElement,
+} from 'react';
 import Head from '@docusaurus/Head';
 import Link from '@docusaurus/Link';
 import CodeBlock from '@theme/CodeBlock';

package/src/theme/Navbar/index.tsx

@@ -21,7 +21,7 @@ import useHideableNavbar from '@theme/hooks/useHideableNavbar';
 import useLockBodyScroll from '@theme/hooks/useLockBodyScroll';
 import useWindowSize from '@theme/hooks/useWindowSize';
 import {useActivePlugin} from '@theme/hooks/useDocs';
-import NavbarItem, {Props as NavbarItemConfig} from '@theme/NavbarItem';
+import NavbarItem, {type Props as NavbarItemConfig} from '@theme/NavbarItem';
 import Logo from '@theme/Logo';
 import IconMenu from '@theme/IconMenu';
 import IconClose from '@theme/IconClose';

package/src/theme/NavbarItem/DocsVersionNavbarItem.tsx

@@ -10,7 +10,7 @@ import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import {
   useActiveVersion,
   useLatestVersion,
-  GlobalVersion,
+  type GlobalVersion,
 } from '@theme/hooks/useDocs';
 import type {Props} from '@theme/NavbarItem/DocsVersionNavbarItem';
 import {useDocsPreferredVersion} from '@docusaurus/theme-common';

package/src/theme/NavbarItem/index.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import DropdownNavbarItem, {
-  Props as DropdownNavbarItemProps,
+  type Props as DropdownNavbarItemProps,
 } from '@theme/NavbarItem/DropdownNavbarItem';
 import LocaleDropdownNavbarItem from '@theme/NavbarItem/LocaleDropdownNavbarItem';
 import SearchNavbarItem from '@theme/NavbarItem/SearchNavbarItem';

package/src/theme/TOCItems/index.tsx

@@ -7,9 +7,9 @@
 
 import React, {useMemo} from 'react';
 import type {TOCItemsProps} from '@theme/TOCItems';
-import {TOCItem} from '@docusaurus/types';
+import type {TOCItem} from '@docusaurus/types';
 import {
-  TOCHighlightConfig,
+  type TOCHighlightConfig,
   useThemeConfig,
   useTOCFilter,
   useTOCHighlight,

package/src/theme/Tabs/index.tsx

@@ -10,7 +10,7 @@ import React, {
   cloneElement,
   Children,
   isValidElement,
-  ReactElement,
+  type ReactElement,
 } from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import useUserPreferencesContext from '@theme/hooks/useUserPreferencesContext';

package/src/theme/TagsListByLetter/index.tsx

@@ -8,7 +8,7 @@
 import React from 'react';
 import Tag from '@theme/Tag';
 import type {Props} from '@theme/TagsListByLetter';
-import {listTagsByLetters, TagLetterEntry} from '@docusaurus/theme-common';
+import {listTagsByLetters, type TagLetterEntry} from '@docusaurus/theme-common';
 
 import styles from './styles.module.css';
 

package/src/theme/Toggle/index.tsx

@@ -7,7 +7,7 @@
 
 import React, {useState, useRef, memo} from 'react';
 import type {Props} from '@theme/Toggle';
-import {useThemeConfig, ColorModeConfig} from '@docusaurus/theme-common';
+import {useThemeConfig, type ColorModeConfig} from '@docusaurus/theme-common';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 
 import clsx from 'clsx';

package/src/theme-classic.d.ts

@@ -107,13 +107,14 @@ declare module '@theme/BlogLayout' {
 }
 
 declare module '@theme/CodeBlock' {
-  import {ReactElement} from 'react';
+  import type {ReactElement} from 'react';
 
   export interface Props {
     readonly children: string | ReactElement;
     readonly className?: string;
     readonly metastring?: string;
     readonly title?: string;
+    readonly language?: string;
   }
 
   const CodeBlock: (props: Props) => JSX.Element;
@@ -181,7 +182,7 @@ declare module '@theme/EditThisPage' {
 }
 
 declare module '@theme/ErrorPageContent' {
-  import ErrorComponent from '@theme/Error';
+  import type ErrorComponent from '@theme/Error';
 
   const ErrorPageContent: typeof ErrorComponent;
   export default ErrorPageContent;
@@ -219,7 +220,7 @@ declare module '@theme/hooks/useLockBodyScroll' {
 }
 
 declare module '@theme/hooks/usePrismTheme' {
-  import defaultTheme from 'prism-react-renderer/themes/palenight';
+  import type defaultTheme from 'prism-react-renderer/themes/palenight';
 
   const usePrismTheme: () => typeof defaultTheme;
   export default usePrismTheme;
@@ -581,7 +582,7 @@ declare module '@theme/ThemedImage' {
 }
 
 declare module '@theme/Details' {
-  import {Details, DetailsProps} from '@docusaurus/theme-common';
+  import {Details, type DetailsProps} from '@docusaurus/theme-common';
 
   export interface Props extends DetailsProps {}
   export default Details;

package/src/translations.ts

@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {TranslationFile, TranslationFileContent} from '@docusaurus/types';
-import {
+import type {TranslationFile, TranslationFileContent} from '@docusaurus/types';
+import type {
   ThemeConfig,
   Navbar,
   NavbarItem,