updated docusaurus

bennobuilder · bennobuilder · commit 6899b53a9cbc · 2022-01-13T15:00:24.000+01:00
diff --git a/package.json b/package.json
@@ -26,11 +26,11 @@
     "@agile-ts/proxytree": "^0.0.9",
     "@agile-ts/react": "^0.2.3",
     "@agile-ts/utils": "^0.0.11",
-    "@docusaurus/core": "2.0.0-beta.9",
-    "@docusaurus/module-type-aliases": "2.0.0-beta.9",
-    "@docusaurus/preset-classic": "2.0.0-beta.9",
-    "@docusaurus/remark-plugin-npm2yarn": "2.0.0-beta.9",
-    "@docusaurus/theme-live-codeblock": "2.0.0-beta.9",
+    "@docusaurus/core": "2.0.0-beta.14",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.14",
+    "@docusaurus/preset-classic": "2.0.0-beta.14",
+    "@docusaurus/remark-plugin-npm2yarn": "2.0.0-beta.14",
+    "@docusaurus/theme-live-codeblock": "2.0.0-beta.14",
     "@mdx-js/react": "^1.6.22",
     "@tsconfig/docusaurus": "^1.0.4",
     "clsx": "^1.1.1",
diff --git a/src/css/custom.scss b/src/css/custom.scss
@@ -143,7 +143,7 @@
   --ifm-dropdown-hover-background-color: var(--ifm-color-background-3);
 
   // Font
-  font-family: "Roboto";
+  font-family: Roboto, serif;
 }
 
 // ==============================================================================
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -4,8 +4,8 @@ import LandingPage from '../_pages/LandingPage';
 import core from '../core';
 
 const Home = () => {
+  // Initial fetch Stats
   useEffect(() => {
-    // Initial fetch Stats
     core.stats.getNPMDownloads();
     core.stats.getGithubStats();
   }, []);
diff --git a/src/theme/DocPage/index.tsx b/src/theme/DocPage/index.tsx
@@ -25,25 +25,29 @@ import IconArrow from '@theme/IconArrow';
 import { matchPath } from '@docusaurus/router';
 import clsx from 'clsx';
 import styles from './styles.module.css';
-import { docVersionSearchTag } from '@docusaurus/theme-common';
-import type { PropVersionMetadata } from '@docusaurus/plugin-content-docs-types';
+import {
+  docVersionSearchTag,
+  DocsSidebarProvider,
+  DocsVersionProvider,
+  useDocsSidebar,
+} from '@docusaurus/theme-common';
+import type { PropVersionMetadata } from '@docusaurus/plugin-content-docs';
 import { translate } from '@docusaurus/Translate';
+import Head from '@docusaurus/Head';
 
 type DocPageContentProps = {
   readonly currentDocRoute: DocumentRoute;
   readonly versionMetadata: PropVersionMetadata;
+  readonly sidebarName: string | undefined;
   readonly children: ReactNode;
 };
 
 const DocPageContent = (props: DocPageContentProps) => {
-  const { currentDocRoute, versionMetadata, children } = props;
+  const { currentDocRoute, versionMetadata, children, sidebarName } = props;
   const { siteConfig } = useDocusaurusContext();
   const { pluginId, version } = versionMetadata;
+  const sidebar = useDocsSidebar();
 
-  const sidebarName = currentDocRoute.sidebar;
-  const sidebar = sidebarName
-    ? versionMetadata.docsSidebars[sidebarName]
-    : undefined;
   const [hiddenSidebarContainer, setHiddenSidebarContainer] = useState(false);
   const [hiddenSidebar, setHiddenSidebar] = useState(false);
 
@@ -71,7 +75,7 @@ const DocPageContent = (props: DocPageContentProps) => {
   return (
     <Layout
       wrapperClassName="main-docs-wrapper"
-      searchMetadatas={{
+      searchMetadata={{
         version,
         tag: docVersionSearchTag(pluginId, version),
       }}>
@@ -163,12 +167,30 @@ const DocPage = (props) => {
     return <NotFound {...props} />;
   }
 
+  // For now, the sidebarName is added as route config: not ideal!
+  const sidebarName = currentDocRoute.sidebar;
+
+  const sidebar = sidebarName
+    ? versionMetadata.docsSidebars[sidebarName]
+    : null;
+
   return (
-    <DocPageContent
-      currentDocRoute={currentDocRoute}
-      versionMetadata={versionMetadata}>
-      {renderRoutes(docRoutes, { versionMetadata })}
-    </DocPageContent>
+    <>
+      <Head>
+        {/* TODO we should add a core addRoute({htmlClassName}) generic plugin option */}
+        <html className={versionMetadata.className} />
+      </Head>
+      <DocsVersionProvider version={versionMetadata}>
+        <DocsSidebarProvider sidebar={sidebar}>
+          <DocPageContent
+            currentDocRoute={currentDocRoute}
+            versionMetadata={versionMetadata}
+            sidebarName={sidebarName}>
+            {renderRoutes(docRoutes, { versionMetadata })}
+          </DocPageContent>
+        </DocsSidebarProvider>
+      </DocsVersionProvider>
+    </>
   );
 };
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@`
`143`	`143`	`--ifm-dropdown-hover-background-color: var(--ifm-color-background-3);`
`144`	`144`
`145`	`145`	`// Font`
`146`		`- font-family: "Roboto";`
	`146`	`+ font-family: Roboto, serif;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`// ==============================================================================`