@docusaurus/theme-classic 2.0.0-beta.15 → 2.0.0-beta.16

package/src/translations.ts

@@ -15,7 +15,7 @@ import type {
   SimpleFooter,
 } from '@docusaurus/theme-common';
 
-import {keyBy, chain} from 'lodash';
+import _ from 'lodash';
 import {mergeTranslations} from '@docusaurus/utils';
 
 function getNavbarTranslationFile(navbar: Navbar): TranslationFileContent {
@@ -30,15 +30,17 @@ function getNavbarTranslationFile(navbar: Navbar): TranslationFileContent {
 
   const allNavbarItems = flattenNavbarItems(navbar.items);
 
-  const navbarItemsTranslations: TranslationFileContent = chain(
-    allNavbarItems.filter((navbarItem) => !!navbarItem.label),
-  )
-    .keyBy((navbarItem) => `item.label.${navbarItem.label}`)
-    .mapValues((navbarItem) => ({
-      message: navbarItem.label!,
-      description: `Navbar item with label ${navbarItem.label}`,
-    }))
-    .value();
+  const navbarItemsTranslations: TranslationFileContent = Object.fromEntries(
+    allNavbarItems
+      .filter((navbarItem) => navbarItem.label)
+      .map((navbarItem) => [
+        `item.label.${navbarItem.label}`,
+        {
+          message: navbarItem.label!,
+          description: `Navbar item with label ${navbarItem.label}`,
+        },
+      ]),
+  );
 
   const titleTranslations: TranslationFileContent = navbar.title
     ? {title: {message: navbar.title, description: 'The title in the navbar'}}
@@ -78,33 +80,33 @@ function isMultiColumnFooterLinks(
 }
 
 function getFooterTranslationFile(footer: Footer): TranslationFileContent {
-  const footerLinkTitles: TranslationFileContent = chain(
-    isMultiColumnFooterLinks(footer.links)
-      ? footer.links.filter((link) => !!link.title)
-      : [],
-  )
-    .keyBy((link) => `link.title.${link.title}`)
-    .mapValues((link) => ({
-      message: link.title!,
-      description: `The title of the footer links column with title=${link.title} in the footer`,
-    }))
-    .value();
-
-  const footerLinkLabels: TranslationFileContent = chain(
-    isMultiColumnFooterLinks(footer.links)
-      ? footer.links
-          .flatMap((link) => link.items)
-          .filter((link) => !!link.label)
-      : footer.links.filter((link) => !!link.label),
-  )
-    .keyBy((linkItem) => `link.item.label.${linkItem.label}`)
-    .mapValues((linkItem) => ({
-      message: linkItem.label!,
-      description: `The label of footer link with label=${
-        linkItem.label
-      } linking to ${linkItem.to ?? linkItem.href}`,
-    }))
-    .value();
+  const footerLinkTitles: TranslationFileContent = Object.fromEntries(
+    (isMultiColumnFooterLinks(footer.links)
+      ? footer.links.filter((link) => link.title)
+      : []
+    ).map((link) => [
+      `link.title.${link.title}`,
+      {
+        message: link.title!,
+        description: `The title of the footer links column with title=${link.title} in the footer`,
+      },
+    ]),
+  );
+
+  const footerLinkLabels: TranslationFileContent = Object.fromEntries(
+    (isMultiColumnFooterLinks(footer.links)
+      ? footer.links.flatMap((link) => link.items).filter((link) => link.label)
+      : footer.links.filter((link) => link.label)
+    ).map((link) => [
+      `link.item.label.${link.label}`,
+      {
+        message: link.label!,
+        description: `The label of footer link with label=${
+          link.label
+        } linking to ${link.to ?? link.href}`,
+      },
+    ]),
+  );
 
   const copyright: TranslationFileContent = footer.copyright
     ? {
@@ -171,12 +173,12 @@ export function translateThemeConfig({
   themeConfig,
   translationFiles,
 }: {
-  // Why partial? To make TS correctly figure out the contravariance in parameter.
+  // To make TS correctly figure out the contravariance in parameter.
   // In practice it's always normalized
   themeConfig: ThemeConfig;
   translationFiles: TranslationFile[];
 }): ThemeConfig {
-  const translationFilesMap: Record<string, TranslationFile> = keyBy(
+  const translationFilesMap: Record<string, TranslationFile> = _.keyBy(
     translationFiles,
     (f) => f.path,
   );

package/src/validateThemeConfig.ts

@@ -29,7 +29,7 @@ const DEFAULT_COLOR_MODE_CONFIG = {
   },
 };
 
-const DEFAULT_CONFIG = {
+export const DEFAULT_CONFIG = {
   colorMode: DEFAULT_COLOR_MODE_CONFIG,
   docs: DEFAULT_DOCS_CONFIG,
   metadata: [],
@@ -54,8 +54,8 @@ const NavbarItemBaseSchema = Joi.object({
   label: Joi.string(),
   className: Joi.string(),
 })
-  // We allow any unknown attributes on the links
-  // (users may need additional attributes like target, aria-role, data-customAttribute...)
+  // We allow any unknown attributes on the links (users may need additional
+  // attributes like target, aria-role, data-customAttribute...)
   .unknown();
 
 const DefaultNavbarItemSchema = NavbarItemBaseSchema.append({
@@ -116,6 +116,10 @@ const DropdownSubitemSchema = Joi.object({
       is: itemWithType('doc'),
       then: DocItemSchema,
     },
+    {
+      is: itemWithType('docSidebar'),
+      then: DocSidebarItemSchema,
+    },
     {
       is: itemWithType(undefined),
       then: DefaultNavbarItemSchema,
@@ -251,15 +255,15 @@ const FooterLinkItemSchema = Joi.object({
   .with('to', 'label')
   .with('href', 'label')
   .nand('html', 'label')
-  // We allow any unknown attributes on the links
-  // (users may need additional attributes like target, aria-role, data-customAttribute...)
+  // We allow any unknown attributes on the links (users may need additional
+  // attributes like target, aria-role, data-customAttribute...)
   .unknown();
 
 const CustomCssSchema = Joi.alternatives()
   .try(Joi.array().items(Joi.string().required()), Joi.string().required())
   .optional();
 
-const ThemeConfigSchema = Joi.object({
+export const ThemeConfigSchema = Joi.object({
   // TODO temporary (@alpha-58)
   disableDarkMode: Joi.any().forbidden().messages({
     'any.unknown':
@@ -382,8 +386,6 @@ const ThemeConfigSchema = Joi.object({
   }).default(DEFAULT_CONFIG.tableOfContents),
 });
 
-export {DEFAULT_CONFIG, ThemeConfigSchema};
-
 export function validateThemeConfig({
   validate,
   themeConfig,

package/lib-next/theme/DocSidebarItems/styles.module.css

@@ -1,20 +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.
- */
-
-@media (min-width: 997px) {
-  .menuLinkText {
-    cursor: initial;
-  }
-
-  .menuLinkText:hover {
-    background: none;
-  }
-
-  .menuLinkText.hasHref {
-    cursor: pointer;
-  }
-}

package/lib-next/theme/Heading/styles.css

@@ -1,22 +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.
- */
-
-.hash-link {
-  opacity: 0;
-  padding-left: 0.5rem;
-  transition: opacity var(--ifm-transition-fast);
-  user-select: none;
-}
-
-.hash-link::before {
-  content: '#';
-}
-
-.hash-link:focus,
-*:hover > .hash-link {
-  opacity: 1;
-}

package/src/theme/DocSidebarItems/styles.module.css

@@ -1,20 +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.
- */
-
-@media (min-width: 997px) {
-  .menuLinkText {
-    cursor: initial;
-  }
-
-  .menuLinkText:hover {
-    background: none;
-  }
-
-  .menuLinkText.hasHref {
-    cursor: pointer;
-  }
-}

package/src/theme/Heading/styles.css

@@ -1,22 +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.
- */
-
-.hash-link {
-  opacity: 0;
-  padding-left: 0.5rem;
-  transition: opacity var(--ifm-transition-fast);
-  user-select: none;
-}
-
-.hash-link::before {
-  content: '#';
-}
-
-.hash-link:focus,
-*:hover > .hash-link {
-  opacity: 1;
-}