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

package/lib/getSwizzleConfig.js

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

package/lib/theme/CodeBlock/{Element/index.d.ts → Content/Element.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/Element';
-export default function CodeBlockElement({ children, className, }: Props): ReactNode;
+import type { Props } from '@theme/CodeBlock/Content/Element';
+export default function CodeBlockJSX({ children, className }: Props): ReactNode;

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

@@ -7,11 +7,12 @@
 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 CodeBlockElement({children, className}) {
+export default function CodeBlockJSX({children, className}) {
   return (
     <Container
       as="pre"

package/lib/theme/CodeBlock/{String/index.d.ts → Content/String.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/String';
+import type { Props } from '@theme/CodeBlock/Content/String';
 export default function CodeBlockString(props: Props): ReactNode;

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

@@ -24,6 +24,7 @@ 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/Content/styles.module.css

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

package/lib/theme/CodeBlock/index.js

@@ -6,8 +6,8 @@
  */
 import React, {isValidElement} from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
-import CodeBlockElement from '@theme/CodeBlock/Element';
-import CodeBlockString from '@theme/CodeBlock/String';
+import ElementContent from '@theme/CodeBlock/Content/Element';
+import StringContent from '@theme/CodeBlock/Content/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' ? CodeBlockString : CodeBlockElement;
+    typeof children === 'string' ? StringContent : ElementContent;
   return (
     <CodeBlockComp key={String(isBrowser)} {...props}>
       {children}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "4.0.0-canary-6953",
+  "version": "4.0.0-canary-6952",
   "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-6953",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6953",
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6953",
-    "@docusaurus/plugin-content-blog": "4.0.0-canary-6953",
-    "@docusaurus/plugin-content-docs": "4.0.0-canary-6953",
-    "@docusaurus/plugin-content-pages": "4.0.0-canary-6953",
-    "@docusaurus/theme-common": "4.0.0-canary-6953",
-    "@docusaurus/theme-translations": "4.0.0-canary-6953",
-    "@docusaurus/types": "4.0.0-canary-6953",
-    "@docusaurus/utils": "4.0.0-canary-6953",
-    "@docusaurus/utils-common": "4.0.0-canary-6953",
-    "@docusaurus/utils-validation": "4.0.0-canary-6953",
+    "@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",
     "@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 component responsible for rendering the syntax-highlighted code lines of a CodeBlock.',
+          'The folder containing components responsible for rendering different types of CodeBlock content.',
       },
       ColorModeToggle: {
         actions: {

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

@@ -8,18 +8,16 @@
 import type {ReactNode} from 'react';
 import clsx from 'clsx';
 import Container from '@theme/CodeBlock/Container';
-import type {Props} from '@theme/CodeBlock/Element';
+import type {Props} from '@theme/CodeBlock/Content/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 CodeBlockElement({
-  children,
-  className,
-}: Props): ReactNode {
+export default function CodeBlockJSX({children, className}: Props): ReactNode {
   return (
     <Container
       as="pre"

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

@@ -13,7 +13,7 @@ import {
   createCodeBlockMetadata,
   useCodeWordWrap,
 } from '@docusaurus/theme-common/internal';
-import type {Props} from '@theme/CodeBlock/String';
+import type {Props} from '@theme/CodeBlock/Content/String';
 import CodeBlockLayout from '@theme/CodeBlock/Layout';
 
 function useCodeBlockMetadata(props: Props): CodeBlockMetadata {
@@ -30,6 +30,7 @@ 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/Content/styles.module.css

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

package/src/theme/CodeBlock/index.tsx

@@ -7,8 +7,8 @@
 
 import React, {isValidElement, type ReactNode} from 'react';
 import useIsBrowser from '@docusaurus/useIsBrowser';
-import CodeBlockElement from '@theme/CodeBlock/Element';
-import CodeBlockString from '@theme/CodeBlock/String';
+import ElementContent from '@theme/CodeBlock/Content/Element';
+import StringContent from '@theme/CodeBlock/Content/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' ? CodeBlockString : CodeBlockElement;
+    typeof children === 'string' ? StringContent : ElementContent;
   return (
     <CodeBlockComp key={String(isBrowser)} {...props}>
       {children as string}

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

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

@@ -1,24 +0,0 @@
-/**
- * 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/Element/styles.module.css

@@ -1,24 +0,0 @@
-/**
- * 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;
-  }
-}