@docusaurus/theme-classic 0.0.0-5150 → 0.0.0-5155

package/lib/index.js

@@ -18,7 +18,9 @@ const ContextReplacementPlugin = requireFromDocusaurusCore('webpack/lib/ContextR
 // Need to be inlined to prevent dark mode FOUC
 // Make sure the key is the same as the one in `/theme/hooks/useTheme.js`
 const ThemeStorageKey = 'theme';
-const noFlashColorMode = ({ defaultMode, respectPrefersColorScheme, }) => `(function() {
+const noFlashColorMode = ({ defaultMode, respectPrefersColorScheme, }) => 
+/* language=js */
+`(function() {
   var defaultMode = '${defaultMode}';
   var respectPrefersColorScheme = ${respectPrefersColorScheme};
 
@@ -62,6 +64,7 @@ const AnnouncementBarDismissDataAttribute = 'data-announcement-bar-initially-dis
 // We always render the announcement bar html on the server, to prevent layout
 // shifts on React hydration. The theme can use CSS + the data attribute to hide
 // the announcement bar asap (before React hydration)
+/* language=js */
 const AnnouncementBarInlineJavaScript = `
 (function() {
   function isDismissed() {

package/lib/theme/BlogTagsListPage/index.js

@@ -14,7 +14,7 @@ import {
 } from '@docusaurus/theme-common';
 import BlogLayout from '@theme/BlogLayout';
 import TagsListByLetter from '@theme/TagsListByLetter';
-import SearchMetadata from '../SearchMetadata';
+import SearchMetadata from '@theme/SearchMetadata';
 export default function BlogTagsListPage({tags, sidebar}) {
   const title = translateTagsPageTitle();
   return (

package/lib/theme/{LayoutProviders → Layout/Provider}/index.d.ts

@@ -5,5 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="react" />
-import type { Props } from '@theme/LayoutProviders';
-export default function LayoutProviders({ children }: Props): JSX.Element;
+import type { Props } from '@theme/Layout/Provider';
+export default function LayoutProvider({ children }: Props): JSX.Element;

package/lib/theme/Layout/Provider/index.js

@@ -0,0 +1,29 @@
+/**
+ * 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.
+ */
+import React from 'react';
+import {composeProviders} from '@docusaurus/theme-common';
+import {
+  ColorModeProvider,
+  TabGroupChoiceProvider,
+  AnnouncementBarProvider,
+  DocsPreferredVersionContextProvider,
+  ScrollControllerProvider,
+  NavbarProvider,
+  PluginHtmlClassNameProvider,
+} from '@docusaurus/theme-common/internal';
+const Provider = composeProviders([
+  ColorModeProvider,
+  AnnouncementBarProvider,
+  TabGroupChoiceProvider,
+  ScrollControllerProvider,
+  DocsPreferredVersionContextProvider,
+  PluginHtmlClassNameProvider,
+  NavbarProvider,
+]);
+export default function LayoutProvider({children}) {
+  return <Provider>{children}</Provider>;
+}

package/lib/theme/Layout/index.d.ts

@@ -5,6 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  */
 /// <reference types="react" />
-import './styles.css';
 import type { Props } from '@theme/Layout';
 export default function Layout(props: Props): JSX.Element;

package/lib/theme/Layout/index.js

@@ -13,9 +13,9 @@ import SkipToContent from '@theme/SkipToContent';
 import AnnouncementBar from '@theme/AnnouncementBar';
 import Navbar from '@theme/Navbar';
 import Footer from '@theme/Footer';
-import LayoutProviders from '@theme/LayoutProviders';
+import LayoutProvider from '@theme/Layout/Provider';
 import ErrorPageContent from '@theme/ErrorPageContent';
-import './styles.css';
+import styles from './styles.module.css';
 export default function Layout(props) {
   const {
     children,
@@ -27,7 +27,7 @@ export default function Layout(props) {
   } = props;
   useKeyboardNavigation();
   return (
-    <LayoutProviders>
+    <LayoutProvider>
       <PageMetadata title={title} description={description} />
 
       <SkipToContent />
@@ -36,13 +36,18 @@ export default function Layout(props) {
 
       <Navbar />
 
-      <div className={clsx(ThemeClassNames.wrapper.main, wrapperClassName)}>
+      <div
+        className={clsx(
+          ThemeClassNames.wrapper.main,
+          styles.mainWrapper,
+          wrapperClassName,
+        )}>
         <ErrorBoundary fallback={(params) => <ErrorPageContent {...params} />}>
           {children}
         </ErrorBoundary>
       </div>
 
       {!noFooter && <Footer />}
-    </LayoutProviders>
+    </LayoutProvider>
   );
 }

package/lib/theme/Layout/{styles.css → styles.module.css}

@@ -5,23 +5,21 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-html,
-body {
+:global(html, body) {
   height: 100%;
 }
 
-#__docusaurus {
-  min-height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.main-wrapper {
+.mainWrapper {
   flex: 1 0 auto;
 }
 
-/* Docusaurus-specific utility classes */
-
-.docusaurus-mt-lg {
+/* Docusaurus-specific utility class */
+:global(.docusaurus-mt-lg) {
   margin-top: 3rem;
 }
+
+:global(#__docusaurus) {
+  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-5150",
+  "version": "0.0.0-5155",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -20,18 +20,18 @@
     "copy:watch": "node ../../admin/scripts/copyUntypedFiles.js --watch"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-5150",
-    "@docusaurus/mdx-loader": "0.0.0-5150",
-    "@docusaurus/module-type-aliases": "0.0.0-5150",
-    "@docusaurus/plugin-content-blog": "0.0.0-5150",
-    "@docusaurus/plugin-content-docs": "0.0.0-5150",
-    "@docusaurus/plugin-content-pages": "0.0.0-5150",
-    "@docusaurus/theme-common": "0.0.0-5150",
-    "@docusaurus/theme-translations": "0.0.0-5150",
-    "@docusaurus/types": "0.0.0-5150",
-    "@docusaurus/utils": "0.0.0-5150",
-    "@docusaurus/utils-common": "0.0.0-5150",
-    "@docusaurus/utils-validation": "0.0.0-5150",
+    "@docusaurus/core": "0.0.0-5155",
+    "@docusaurus/mdx-loader": "0.0.0-5155",
+    "@docusaurus/module-type-aliases": "0.0.0-5155",
+    "@docusaurus/plugin-content-blog": "0.0.0-5155",
+    "@docusaurus/plugin-content-docs": "0.0.0-5155",
+    "@docusaurus/plugin-content-pages": "0.0.0-5155",
+    "@docusaurus/theme-common": "0.0.0-5155",
+    "@docusaurus/theme-translations": "0.0.0-5155",
+    "@docusaurus/types": "0.0.0-5155",
+    "@docusaurus/utils": "0.0.0-5155",
+    "@docusaurus/utils-common": "0.0.0-5155",
+    "@docusaurus/utils-validation": "0.0.0-5155",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "copy-text-to-clipboard": "^3.0.1",
@@ -64,5 +64,5 @@
   "engines": {
     "node": ">=16.14"
   },
-  "gitHead": "ce60d4bffb10467c5aea33c4a933a5986909a2ed"
+  "gitHead": "4e19c915902d434cddbb68402655c0dccc98c325"
 }

package/src/index.ts

@@ -29,7 +29,9 @@ const ThemeStorageKey = 'theme';
 const noFlashColorMode = ({
   defaultMode,
   respectPrefersColorScheme,
-}: ThemeConfig['colorMode']) => `(function() {
+}: ThemeConfig['colorMode']) =>
+  /* language=js */
+  `(function() {
   var defaultMode = '${defaultMode}';
   var respectPrefersColorScheme = ${respectPrefersColorScheme};
 
@@ -76,6 +78,7 @@ const AnnouncementBarDismissDataAttribute =
 // We always render the announcement bar html on the server, to prevent layout
 // shifts on React hydration. The theme can use CSS + the data attribute to hide
 // the announcement bar asap (before React hydration)
+/* language=js */
 const AnnouncementBarInlineJavaScript = `
 (function() {
   function isDismissed() {

package/src/theme/BlogTagsListPage/index.tsx

@@ -16,7 +16,7 @@ import {
 import BlogLayout from '@theme/BlogLayout';
 import TagsListByLetter from '@theme/TagsListByLetter';
 import type {Props} from '@theme/BlogTagsListPage';
-import SearchMetadata from '../SearchMetadata';
+import SearchMetadata from '@theme/SearchMetadata';
 
 export default function BlogTagsListPage({tags, sidebar}: Props): JSX.Element {
   const title = translateTagsPageTitle();

package/src/theme/Layout/Provider/index.tsx

@@ -0,0 +1,33 @@
+/**
+ * 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.
+ */
+
+import React from 'react';
+import {composeProviders} from '@docusaurus/theme-common';
+import {
+  ColorModeProvider,
+  TabGroupChoiceProvider,
+  AnnouncementBarProvider,
+  DocsPreferredVersionContextProvider,
+  ScrollControllerProvider,
+  NavbarProvider,
+  PluginHtmlClassNameProvider,
+} from '@docusaurus/theme-common/internal';
+import type {Props} from '@theme/Layout/Provider';
+
+const Provider = composeProviders([
+  ColorModeProvider,
+  AnnouncementBarProvider,
+  TabGroupChoiceProvider,
+  ScrollControllerProvider,
+  DocsPreferredVersionContextProvider,
+  PluginHtmlClassNameProvider,
+  NavbarProvider,
+]);
+
+export default function LayoutProvider({children}: Props): JSX.Element {
+  return <Provider>{children}</Provider>;
+}

package/src/theme/Layout/index.tsx

@@ -14,10 +14,10 @@ import SkipToContent from '@theme/SkipToContent';
 import AnnouncementBar from '@theme/AnnouncementBar';
 import Navbar from '@theme/Navbar';
 import Footer from '@theme/Footer';
-import LayoutProviders from '@theme/LayoutProviders';
+import LayoutProvider from '@theme/Layout/Provider';
 import ErrorPageContent from '@theme/ErrorPageContent';
-import './styles.css';
 import type {Props} from '@theme/Layout';
+import styles from './styles.module.css';
 
 export default function Layout(props: Props): JSX.Element {
   const {
@@ -32,7 +32,7 @@ export default function Layout(props: Props): JSX.Element {
   useKeyboardNavigation();
 
   return (
-    <LayoutProviders>
+    <LayoutProvider>
       <PageMetadata title={title} description={description} />
 
       <SkipToContent />
@@ -41,13 +41,18 @@ export default function Layout(props: Props): JSX.Element {
 
       <Navbar />
 
-      <div className={clsx(ThemeClassNames.wrapper.main, wrapperClassName)}>
+      <div
+        className={clsx(
+          ThemeClassNames.wrapper.main,
+          styles.mainWrapper,
+          wrapperClassName,
+        )}>
         <ErrorBoundary fallback={(params) => <ErrorPageContent {...params} />}>
           {children}
         </ErrorBoundary>
       </div>
 
       {!noFooter && <Footer />}
-    </LayoutProviders>
+    </LayoutProvider>
   );
 }

package/src/theme/Layout/{styles.css → styles.module.css}

@@ -5,23 +5,21 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-html,
-body {
+:global(html, body) {
   height: 100%;
 }
 
-#__docusaurus {
-  min-height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.main-wrapper {
+.mainWrapper {
   flex: 1 0 auto;
 }
 
-/* Docusaurus-specific utility classes */
-
-.docusaurus-mt-lg {
+/* Docusaurus-specific utility class */
+:global(.docusaurus-mt-lg) {
   margin-top: 3rem;
 }
+
+:global(#__docusaurus) {
+  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+}

package/src/theme-classic.d.ts

@@ -596,14 +596,14 @@ declare module '@theme/Layout' {
   export default function Layout(props: Props): JSX.Element;
 }
 
-declare module '@theme/LayoutProviders' {
+declare module '@theme/Layout/Provider' {
   import type {ReactNode} from 'react';
 
   export interface Props {
     readonly children: ReactNode;
   }
 
-  export default function LayoutProviders(props: Props): JSX.Element;
+  export default function LayoutProvider(props: Props): JSX.Element;
 }
 
 declare module '@theme/SearchMetadata' {

package/lib/theme/LayoutProviders/index.js

@@ -1,33 +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.
- */
-import React from 'react';
-import {
-  ColorModeProvider,
-  TabGroupChoiceProvider,
-  AnnouncementBarProvider,
-  DocsPreferredVersionContextProvider,
-  ScrollControllerProvider,
-  NavbarProvider,
-  PluginHtmlClassNameProvider,
-} from '@docusaurus/theme-common/internal';
-export default function LayoutProviders({children}) {
-  return (
-    <ColorModeProvider>
-      <AnnouncementBarProvider>
-        <TabGroupChoiceProvider>
-          <ScrollControllerProvider>
-            <DocsPreferredVersionContextProvider>
-              <PluginHtmlClassNameProvider>
-                <NavbarProvider>{children}</NavbarProvider>
-              </PluginHtmlClassNameProvider>
-            </DocsPreferredVersionContextProvider>
-          </ScrollControllerProvider>
-        </TabGroupChoiceProvider>
-      </AnnouncementBarProvider>
-    </ColorModeProvider>
-  );
-}

package/src/theme/LayoutProviders/index.tsx

@@ -1,36 +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.
- */
-
-import React from 'react';
-import {
-  ColorModeProvider,
-  TabGroupChoiceProvider,
-  AnnouncementBarProvider,
-  DocsPreferredVersionContextProvider,
-  ScrollControllerProvider,
-  NavbarProvider,
-  PluginHtmlClassNameProvider,
-} from '@docusaurus/theme-common/internal';
-import type {Props} from '@theme/LayoutProviders';
-
-export default function LayoutProviders({children}: Props): JSX.Element {
-  return (
-    <ColorModeProvider>
-      <AnnouncementBarProvider>
-        <TabGroupChoiceProvider>
-          <ScrollControllerProvider>
-            <DocsPreferredVersionContextProvider>
-              <PluginHtmlClassNameProvider>
-                <NavbarProvider>{children}</NavbarProvider>
-              </PluginHtmlClassNameProvider>
-            </DocsPreferredVersionContextProvider>
-          </ScrollControllerProvider>
-        </TabGroupChoiceProvider>
-      </AnnouncementBarProvider>
-    </ColorModeProvider>
-  );
-}