@docusaurus/theme-classic 0.0.0-4114 → 0.0.0-4120

package/lib/theme/DocPage/index.js

@@ -125,7 +125,7 @@ function DocPage(props) {
   const currentDocRoute = docRoutes.find(docRoute => (0, _router.matchPath)(location.pathname, docRoute));
 
   if (!currentDocRoute) {
-    return <_NotFound.default {...props} />;
+    return <_NotFound.default />;
   }
 
   return <>

package/lib/theme/hooks/useWindowSize.js

@@ -52,10 +52,9 @@ function useWindowSize() {
   (0, _react.useEffect)(() => {
     function updateWindowSize() {
       setWindowSize(getWindowSize());
-    } // @ts-expect-error: annoying TS setTimeout typing...
-
+    }
 
-    const timeout = DevSimulateSSR ? setTimeout(updateWindowSize, 1000) : undefined;
+    const timeout = DevSimulateSSR ? window.setTimeout(updateWindowSize, 1000) : undefined;
     window.addEventListener('resize', updateWindowSize);
     return () => {
       window.removeEventListener('resize', updateWindowSize);

package/lib/translations.js

@@ -19,12 +19,12 @@ var _utils = require("@docusaurus/utils");
 function getNavbarTranslationFile(navbar) {
   // TODO handle properly all the navbar item types here!
   function flattenNavbarItems(items) {
-    const subItems = (0, _lodash.flatten)(items.map(item => {
+    const subItems = items.flatMap(item => {
       var _item$items;
 
-      const allSubItems = (0, _lodash.flatten)([(_item$items = item.items) !== null && _item$items !== void 0 ? _item$items : []]);
+      const allSubItems = [(_item$items = item.items) !== null && _item$items !== void 0 ? _item$items : []].flat();
       return flattenNavbarItems(allSubItems);
-    }));
+    });
     return [...items, ...subItems];
   }
 
@@ -74,7 +74,7 @@ function getFooterTranslationFile(footer) {
     message: link.title,
     description: `The title of the footer links column with title=${link.title} in the footer`
   })).value();
-  const footerLinkLabels = (0, _lodash.chain)((0, _lodash.flatten)(footer.links.map(link => link.items)).filter(link => !!link.label)).keyBy(linkItem => `link.item.label.${linkItem.label}`).mapValues(linkItem => {
+  const footerLinkLabels = (0, _lodash.chain)(footer.links.flatMap(link => link.items).filter(link => !!link.label)).keyBy(linkItem => `link.item.label.${linkItem.label}`).mapValues(linkItem => {
     var _linkItem$to;
 
     return {

package/lib/types.d.ts

@@ -778,7 +778,7 @@ declare module '@theme/TagsListByLetter' {
 }
 
 declare module '@theme/TagsListInline' {
-  export type Tag = Readonly<{label: string; permalink}>;
+  export type Tag = Readonly<{label: string; permalink: string}>;
   export interface Props {
     readonly tags: readonly Tag[];
   }

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

@@ -130,7 +130,7 @@ function DocPage(props) {
   );
 
   if (!currentDocRoute) {
-    return <NotFound {...props} />;
+    return <NotFound />;
   }
 
   return (

package/lib-next/theme/hooks/useWindowSize.js

@@ -42,10 +42,10 @@ function useWindowSize() {
   useEffect(() => {
     function updateWindowSize() {
       setWindowSize(getWindowSize());
-    } // @ts-expect-error: annoying TS setTimeout typing...
+    }
 
     const timeout = DevSimulateSSR
-      ? setTimeout(updateWindowSize, 1000)
+      ? window.setTimeout(updateWindowSize, 1000)
       : undefined;
     window.addEventListener('resize', updateWindowSize);
     return () => {

package/lib-next/translations.js

@@ -4,18 +4,16 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import {keyBy, chain, flatten} from 'lodash';
+import {keyBy, chain} from 'lodash';
 import {mergeTranslations} from '@docusaurus/utils';
 
 function getNavbarTranslationFile(navbar) {
   // TODO handle properly all the navbar item types here!
   function flattenNavbarItems(items) {
-    const subItems = flatten(
-      items.map((item) => {
-        const allSubItems = flatten([item.items ?? []]);
-        return flattenNavbarItems(allSubItems);
-      }),
-    );
+    const subItems = items.flatMap((item) => {
+      const allSubItems = [item.items ?? []].flat();
+      return flattenNavbarItems(allSubItems);
+    });
     return [...items, ...subItems];
   }
 
@@ -76,9 +74,7 @@ function getFooterTranslationFile(footer) {
     }))
     .value();
   const footerLinkLabels = chain(
-    flatten(footer.links.map((link) => link.items)).filter(
-      (link) => !!link.label,
-    ),
+    footer.links.flatMap((link) => link.items).filter((link) => !!link.label),
   )
     .keyBy((linkItem) => `link.item.label.${linkItem.label}`)
     .mapValues((linkItem) => ({

package/lib-next/types.d.ts

@@ -778,7 +778,7 @@ declare module '@theme/TagsListByLetter' {
 }
 
 declare module '@theme/TagsListInline' {
-  export type Tag = Readonly<{label: string; permalink}>;
+  export type Tag = Readonly<{label: string; permalink: string}>;
   export interface Props {
     readonly tags: readonly Tag[];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "0.0.0-4114",
+  "version": "0.0.0-4120",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/types.d.ts",
@@ -23,15 +23,15 @@
     "update-code-translations": "node -e 'require(\"./update-code-translations.js\").run()'"
   },
   "dependencies": {
-    "@docusaurus/core": "0.0.0-4114",
-    "@docusaurus/plugin-content-blog": "0.0.0-4114",
-    "@docusaurus/plugin-content-docs": "0.0.0-4114",
-    "@docusaurus/plugin-content-pages": "0.0.0-4114",
-    "@docusaurus/theme-common": "0.0.0-4114",
-    "@docusaurus/types": "0.0.0-4114",
-    "@docusaurus/utils": "0.0.0-4114",
-    "@docusaurus/utils-common": "0.0.0-4114",
-    "@docusaurus/utils-validation": "0.0.0-4114",
+    "@docusaurus/core": "0.0.0-4120",
+    "@docusaurus/plugin-content-blog": "0.0.0-4120",
+    "@docusaurus/plugin-content-docs": "0.0.0-4120",
+    "@docusaurus/plugin-content-pages": "0.0.0-4120",
+    "@docusaurus/theme-common": "0.0.0-4120",
+    "@docusaurus/types": "0.0.0-4120",
+    "@docusaurus/utils": "0.0.0-4120",
+    "@docusaurus/utils-common": "0.0.0-4120",
+    "@docusaurus/utils-validation": "0.0.0-4120",
     "@mdx-js/mdx": "^1.6.21",
     "@mdx-js/react": "^1.6.21",
     "chalk": "^4.1.2",
@@ -50,7 +50,7 @@
     "rtlcss": "^3.3.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "0.0.0-4114",
+    "@docusaurus/module-type-aliases": "0.0.0-4120",
     "@types/mdx-js__react": "^1.5.4",
     "@types/parse-numeric-range": "^0.0.1",
     "@types/rtlcss": "^3.1.1",
@@ -64,5 +64,5 @@
   "engines": {
     "node": ">=12.13.0"
   },
-  "gitHead": "c0c6b5bb61f0742af9d188f3c01b2963ba033c39"
+  "gitHead": "a940930d58733425dea30637c233659c10731a73"
 }

package/src/theme/DocPage/index.tsx

@@ -148,7 +148,7 @@ function DocPage(props: Props): JSX.Element {
     matchPath(location.pathname, docRoute),
   );
   if (!currentDocRoute) {
-    return <NotFound {...props} />;
+    return <NotFound />;
   }
   return (
     <>

package/src/theme/hooks/useWindowSize.ts

@@ -51,9 +51,8 @@ function useWindowSize(): WindowSize {
       setWindowSize(getWindowSize());
     }
 
-    // @ts-expect-error: annoying TS setTimeout typing...
-    const timeout: number | undefined = DevSimulateSSR
-      ? setTimeout(updateWindowSize, 1000)
+    const timeout = DevSimulateSSR
+      ? window.setTimeout(updateWindowSize, 1000)
       : undefined;
 
     window.addEventListener('resize', updateWindowSize);

package/src/translations.ts

@@ -13,18 +13,16 @@ import {
   Footer,
 } from '@docusaurus/theme-common';
 
-import {keyBy, chain, flatten} from 'lodash';
+import {keyBy, chain} from 'lodash';
 import {mergeTranslations} from '@docusaurus/utils';
 
 function getNavbarTranslationFile(navbar: Navbar): TranslationFileContent {
   // TODO handle properly all the navbar item types here!
   function flattenNavbarItems(items: NavbarItem[]): NavbarItem[] {
-    const subItems = flatten(
-      items.map((item) => {
-        const allSubItems = flatten([item.items ?? []]);
-        return flattenNavbarItems(allSubItems);
-      }),
-    );
+    const subItems = items.flatMap((item) => {
+      const allSubItems = [item.items ?? []].flat();
+      return flattenNavbarItems(allSubItems);
+    });
     return [...items, ...subItems];
   }
 
@@ -84,9 +82,7 @@ function getFooterTranslationFile(footer: Footer): TranslationFileContent {
     .value();
 
   const footerLinkLabels: TranslationFileContent = chain(
-    flatten(footer.links.map((link) => link.items)).filter(
-      (link) => !!link.label,
-    ),
+    footer.links.flatMap((link) => link.items).filter((link) => !!link.label),
   )
     .keyBy((linkItem) => `link.item.label.${linkItem.label}`)
     .mapValues((linkItem) => ({

package/src/types.d.ts

@@ -778,7 +778,7 @@ declare module '@theme/TagsListByLetter' {
 }
 
 declare module '@theme/TagsListInline' {
-  export type Tag = Readonly<{label: string; permalink}>;
+  export type Tag = Readonly<{label: string; permalink: string}>;
   export interface Props {
     readonly tags: readonly Tag[];
   }