From cd21a31005eefb4e04124d3cd1f53334e1f76254 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Wed, 25 May 2022 15:38:44 +0800
Subject: [PATCH 01/16] test: strengthen internal types (#7488)

---
 jest/deps.d.ts                                | 13 +++++++--
 .../__tests__/index.test.ts                   | 12 ++++-----
 packages/docusaurus-migrate/src/index.ts      |  2 +-
 packages/docusaurus-migrate/src/types.ts      | 27 +++++++++----------
 .../src/__tests__/index.test.ts               | 11 ++++----
 .../src/utils/reactUtils.tsx                  |  2 +-
 .../src/theme/SearchBar/index.tsx             |  4 ++-
 .../src/__tests__/validationUtils.test.ts     |  7 +++--
 .../src/client/PendingNavigation.tsx          |  6 ++---
 packages/docusaurus/src/commands/deploy.ts    | 20 +++++++-------
 .../commands/swizzle/__tests__/index.test.ts  |  2 +-
 .../server/plugins/__tests__/index.test.ts    |  2 +-
 .../docs/api/plugins/plugin-content-docs.md   |  4 +--
 website/docs/api/plugins/plugin-pwa.md        |  6 ++---
 .../markdown-features-toc.mdx                 |  4 +--
 15 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/jest/deps.d.ts b/jest/deps.d.ts
index a0694f5b8128..16ad1b75fdbd 100644
--- a/jest/deps.d.ts
+++ b/jest/deps.d.ts
@@ -7,9 +7,18 @@
 
 // modules only used in tests
 
-declare module 'to-vfile';
+declare module 'to-vfile' {
+  import type {VFile} from 'vfile';
 
-declare module 'remark-mdx';
+  export function read(path: string, encoding?: string): Promise<VFile>;
+}
+
+declare module 'remark-mdx' {
+  import type {Plugin} from 'unified';
+
+  const mdx: Plugin;
+  export = mdx;
+}
 
 declare module '@testing-utils/git' {
   const createTempRepo: typeof import('./utils/git').createTempRepo;
diff --git a/packages/docusaurus-cssnano-preset/src/remove-overridden-custom-properties/__tests__/index.test.ts b/packages/docusaurus-cssnano-preset/src/remove-overridden-custom-properties/__tests__/index.test.ts
index 8e50db5a74bd..9ce352bd90c5 100644
--- a/packages/docusaurus-cssnano-preset/src/remove-overridden-custom-properties/__tests__/index.test.ts
+++ b/packages/docusaurus-cssnano-preset/src/remove-overridden-custom-properties/__tests__/index.test.ts
@@ -10,8 +10,8 @@ import vfile from 'to-vfile';
 import postcss from 'postcss';
 import postCssRemoveOverriddenCustomProperties from '../index';
 
-const processFixture = (name: string) => {
-  const input = vfile.readSync(
+const processFixture = async (name: string) => {
+  const input = await vfile.read(
     path.join(__dirname, '__fixtures__', `${name}.css`),
     'utf8',
   );
@@ -23,11 +23,11 @@ const processFixture = (name: string) => {
 };
 
 describe('remove-overridden-custom-properties', () => {
-  it('overridden custom properties should be removed', () => {
-    expect(processFixture('normal')).toMatchSnapshot();
+  it('overridden custom properties should be removed', async () => {
+    await expect(processFixture('normal')).resolves.toMatchSnapshot();
   });
 
-  it('overridden custom properties with `!important` rule should not be removed', () => {
-    expect(processFixture('important_rule')).toMatchSnapshot();
+  it('overridden custom properties with `!important` rule should not be removed', async () => {
+    await expect(processFixture('important_rule')).resolves.toMatchSnapshot();
   });
 });
diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts
index 165c7c2fd32f..f5bf38134bc0 100644
--- a/packages/docusaurus-migrate/src/index.ts
+++ b/packages/docusaurus-migrate/src/index.ts
@@ -552,7 +552,7 @@ async function migrateVersionedSidebar(
         (topLevel: SidebarEntries, value) => {
           const key = value[0].replace(versionRegex, '');
           topLevel[key] = Object.entries(value[1]).reduce<{
-            [key: string]: Array<string | {[key: string]: unknown}>;
+            [key: string]: (string | {[key: string]: unknown})[];
           }>((acc, val) => {
             acc[val[0].replace(versionRegex, '')] = (
               val[1] as SidebarEntry[]
diff --git a/packages/docusaurus-migrate/src/types.ts b/packages/docusaurus-migrate/src/types.ts
index 022139f3489d..39b5fc2d53ae 100644
--- a/packages/docusaurus-migrate/src/types.ts
+++ b/packages/docusaurus-migrate/src/types.ts
@@ -34,7 +34,7 @@ export type SidebarEntry =
 export type SidebarEntries = {
   [key: string]:
     | {[key: string]: unknown}
-    | Array<{[key: string]: unknown} | string>;
+    | ({[key: string]: unknown} | string)[];
 };
 
 export type VersionTwoConfig = {
@@ -49,7 +49,7 @@ export type VersionTwoConfig = {
   githubHost?: string;
   onBrokenLinks: string;
   onBrokenMarkdownLinks: string;
-  plugins: Array<[string, {[key: string]: unknown}]>;
+  plugins: [string, {[key: string]: unknown}][];
   themes?: [];
   presets: [[string, ClassicPresetEntries]];
   themeConfig: {
@@ -58,17 +58,14 @@ export type VersionTwoConfig = {
       logo?: {
         src?: string;
       };
-      items: Array<{[key: string]: unknown} | null>;
+      items: ({[key: string]: unknown} | null)[];
     };
     image?: string;
     footer: {
-      links: Array<{
+      links: {
         title: string;
-        items: Array<{
-          label: string;
-          to: string;
-        }>;
-      }>;
+        items: {label: string; to: string}[];
+      }[];
       copyright?: string;
       logo: {
         src?: string;
@@ -104,26 +101,26 @@ export type VersionOneConfig = {
   organizationName?: string;
   projectName?: string;
   noIndex?: boolean;
-  headerLinks?: Array<{doc: string; href: string; label: string; page: string}>;
+  headerLinks?: {doc: string; href: string; label: string; page: string}[];
   headerIcon?: string;
   favicon?: string;
   colors?: {primaryColor: string};
   copyright?: string;
   editUrl?: string;
   customDocsPath?: string;
-  users?: Array<{[key: string]: unknown}>;
+  users?: {[key: string]: unknown}[];
   disableHeaderTitle?: string;
   disableTitleTagline?: string;
-  separateCss?: Array<{[key: string]: unknown}>;
+  separateCss?: {[key: string]: unknown}[];
   footerIcon?: string;
   translationRecruitingLink?: string;
   algolia?: {[key: string]: unknown};
   gaTrackingId?: string;
   gaGtag?: boolean;
   highlight?: {[key: string]: unknown};
-  markdownPlugins?: Array<() => void>;
-  scripts?: Array<{src: string; [key: string]: unknown} | string>;
-  stylesheets?: Array<{href: string; [key: string]: unknown} | string>;
+  markdownPlugins?: (() => void)[];
+  scripts?: ({src: string; [key: string]: unknown} | string)[];
+  stylesheets?: ({href: string; [key: string]: unknown} | string)[];
   facebookAppId?: string;
   facebookComments?: true;
   facebookPixelId?: string;
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
index 746288ca95e9..11e54417d884 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -31,6 +31,7 @@ import type {
   Options,
   PluginOptions,
   PropSidebarItemLink,
+  PropSidebars,
 } from '@docusaurus/plugin-content-docs';
 import type {
   SidebarItemsGeneratorOption,
@@ -82,7 +83,7 @@ const createFakeActions = (contentDir: string) => {
 
   // Query by prefix, because files have a hash at the end so it's not
   // convenient to query by full filename
-  const getCreatedDataByPrefix = (prefix: string) => {
+  function getCreatedDataByPrefix(prefix: string) {
     const entry = Object.entries(dataContainer).find(([key]) =>
       key.startsWith(prefix),
     );
@@ -92,8 +93,8 @@ Entries created:
 - ${Object.keys(dataContainer).join('\n- ')}
         `);
     }
-    return JSON.parse(entry[1] as string);
-  };
+    return JSON.parse(entry[1] as string) as PropSidebars;
+  }
 
   // Extra fns useful for tests!
   const utils = {
@@ -571,8 +572,8 @@ describe('versioned website (community)', () => {
       allContent: {},
     });
 
-    utils.checkVersionMetadataPropCreated(currentVersion!);
-    utils.checkVersionMetadataPropCreated(version100!);
+    utils.checkVersionMetadataPropCreated(currentVersion);
+    utils.checkVersionMetadataPropCreated(version100);
 
     utils.expectSnapshot();
   });
diff --git a/packages/docusaurus-theme-common/src/utils/reactUtils.tsx b/packages/docusaurus-theme-common/src/utils/reactUtils.tsx
index 4a7410e3fb6d..4e0982807121 100644
--- a/packages/docusaurus-theme-common/src/utils/reactUtils.tsx
+++ b/packages/docusaurus-theme-common/src/utils/reactUtils.tsx
@@ -71,6 +71,6 @@ export class ReactContextError extends Error {
     this.message = `Hook ${
       this.stack?.split('\n')[1]?.match(/at (?:\w+\.)?(?<name>\w+)/)?.groups!
         .name ?? ''
-    } is called outside the <${providerName}>. ${additionalInfo || ''}`;
+    } is called outside the <${providerName}>. ${additionalInfo ?? ''}`;
   }
 }
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
index bd36e353aa6a..beef496dffcd 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
@@ -120,7 +120,9 @@ function DocSearch({
     }
 
     return Promise.all([
-      import('@docsearch/react/modal'),
+      import('@docsearch/react/modal') as Promise<
+        typeof import('@docsearch/react')
+      >,
       import('@docsearch/react/style'),
       import('./styles.css'),
     ]).then(([{DocSearchModal: Modal}]) => {
diff --git a/packages/docusaurus-utils-validation/src/__tests__/validationUtils.test.ts b/packages/docusaurus-utils-validation/src/__tests__/validationUtils.test.ts
index 771ff94c855c..0bb0fd99a9f3 100644
--- a/packages/docusaurus-utils-validation/src/__tests__/validationUtils.test.ts
+++ b/packages/docusaurus-utils-validation/src/__tests__/validationUtils.test.ts
@@ -42,7 +42,7 @@ describe('normalizePluginOptions', () => {
   it('throws for invalid options', () => {
     const options = {foo: 1};
     expect(() =>
-      normalizePluginOptions(Joi.object({foo: Joi.string()}), options),
+      normalizePluginOptions(Joi.object<object>({foo: Joi.string()}), options),
     ).toThrowErrorMatchingInlineSnapshot(`""foo" must be a string"`);
   });
 
@@ -90,7 +90,10 @@ describe('normalizeThemeConfig', () => {
   it('throws for invalid options', () => {
     const themeConfig = {foo: 1, bar: 1};
     expect(() =>
-      normalizeThemeConfig(Joi.object({foo: Joi.string()}), themeConfig),
+      normalizeThemeConfig(
+        Joi.object<object>({foo: Joi.string()}),
+        themeConfig,
+      ),
     ).toThrowErrorMatchingInlineSnapshot(`""foo" must be a string"`);
   });
 
diff --git a/packages/docusaurus/src/client/PendingNavigation.tsx b/packages/docusaurus/src/client/PendingNavigation.tsx
index 24e1e38faa2d..e1e38f40f817 100644
--- a/packages/docusaurus/src/client/PendingNavigation.tsx
+++ b/packages/docusaurus/src/client/PendingNavigation.tsx
@@ -35,7 +35,7 @@ class PendingNavigation extends React.Component<Props, State> {
       ? dispatchLifecycleAction('onRouteUpdate', {
           previousLocation: null,
           location: this.props.location,
-        })!
+        })
       : () => {};
     this.state = {
       nextRouteHasLoaded: true,
@@ -60,14 +60,14 @@ class PendingNavigation extends React.Component<Props, State> {
     this.routeUpdateCleanupCb = dispatchLifecycleAction('onRouteUpdate', {
       previousLocation: this.previousLocation,
       location: nextLocation,
-    })!;
+    });
 
     // Load data while the old screen remains. Force preload instead of using
     // `window.docusaurus`, because we want to avoid loading screen even when
     // user is on saveData
     preload(nextLocation.pathname)
       .then(() => {
-        this.routeUpdateCleanupCb?.();
+        this.routeUpdateCleanupCb();
         this.setState({nextRouteHasLoaded: true});
       })
       .catch((e: unknown) => console.warn(e));
diff --git a/packages/docusaurus/src/commands/deploy.ts b/packages/docusaurus/src/commands/deploy.ts
index e35783ddb745..9b5f233f5bf4 100644
--- a/packages/docusaurus/src/commands/deploy.ts
+++ b/packages/docusaurus/src/commands/deploy.ts
@@ -69,7 +69,7 @@ This behavior can have SEO impacts and create relative link issues.
 
   // The source branch; defaults to the currently checked out branch
   const sourceBranch =
-    process.env.CURRENT_BRANCH ||
+    process.env.CURRENT_BRANCH ??
     shell.exec('git rev-parse --abbrev-ref HEAD', {silent: true}).stdout.trim();
 
   const gitUser = process.env.GIT_USER;
@@ -90,8 +90,8 @@ This behavior can have SEO impacts and create relative link issues.
   }
 
   const organizationName =
-    process.env.ORGANIZATION_NAME ||
-    process.env.CIRCLE_PROJECT_USERNAME ||
+    process.env.ORGANIZATION_NAME ??
+    process.env.CIRCLE_PROJECT_USERNAME ??
     siteConfig.organizationName;
   if (!organizationName) {
     throw new Error(
@@ -101,8 +101,8 @@ This behavior can have SEO impacts and create relative link issues.
   logger.info`organizationName: name=${organizationName}`;
 
   const projectName =
-    process.env.PROJECT_NAME ||
-    process.env.CIRCLE_PROJECT_REPONAME ||
+    process.env.PROJECT_NAME ??
+    process.env.CIRCLE_PROJECT_REPONAME ??
     siteConfig.projectName;
   if (!projectName) {
     throw new Error(
@@ -113,7 +113,7 @@ This behavior can have SEO impacts and create relative link issues.
 
   // We never deploy on pull request.
   const isPullRequest =
-    process.env.CI_PULL_REQUEST || process.env.CIRCLE_PULL_REQUEST;
+    process.env.CI_PULL_REQUEST ?? process.env.CIRCLE_PULL_REQUEST;
   if (isPullRequest) {
     shell.echo('Skipping deploy on a pull request.');
     shell.exit(0);
@@ -136,12 +136,12 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
   }
 
   const deploymentBranch =
-    process.env.DEPLOYMENT_BRANCH || siteConfig.deploymentBranch || 'gh-pages';
+    process.env.DEPLOYMENT_BRANCH ?? siteConfig.deploymentBranch ?? 'gh-pages';
   logger.info`deploymentBranch: name=${deploymentBranch}`;
 
   const githubHost =
-    process.env.GITHUB_HOST || siteConfig.githubHost || 'github.com';
-  const githubPort = process.env.GITHUB_PORT || siteConfig.githubPort;
+    process.env.GITHUB_HOST ?? siteConfig.githubHost ?? 'github.com';
+  const githubPort = process.env.GITHUB_PORT ?? siteConfig.githubPort;
 
   let deploymentRepoURL: string;
   if (useSSH) {
@@ -214,7 +214,7 @@ You can also set the deploymentBranch property in docusaurus.config.js .`);
     shellExecLog('git add --all');
 
     const commitMessage =
-      process.env.CUSTOM_COMMIT_MESSAGE ||
+      process.env.CUSTOM_COMMIT_MESSAGE ??
       `Deploy website - based on ${currentCommit}`;
     const commitResults = shellExecLog(`git commit -m "${commitMessage}"`);
     if (
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
index 74e94678f3c2..462c44c1a09e 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
@@ -65,7 +65,7 @@ function createExitMock() {
   });
   // eslint-disable-next-line jest/require-top-level-describe
   afterEach(async () => {
-    mock?.mockRestore();
+    mock.mockRestore();
   });
 
   return {
diff --git a/packages/docusaurus/src/server/plugins/__tests__/index.test.ts b/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
index 2d85798e3633..0ace57b22cd9 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
@@ -28,7 +28,7 @@ describe('loadPlugins', () => {
                 name: 'test1',
                 prop: 'a',
                 async loadContent() {
-                  // Testing that plugin lifecycle is bound to the plugin instance
+                  // Testing that plugin lifecycle is bound to the instance
                   return this.prop;
                 },
                 async contentLoaded({content, actions}) {
diff --git a/website/docs/api/plugins/plugin-content-docs.md b/website/docs/api/plugins/plugin-content-docs.md
index e5971ee2fa59..331c7cb0a9f9 100644
--- a/website/docs/api/plugins/plugin-content-docs.md
+++ b/website/docs/api/plugins/plugin-content-docs.md
@@ -96,14 +96,14 @@ type SidebarGenerator = (generatorArgs: {
   /** Useful metadata for the version this sidebar belongs to. */
   version: {contentPath: string; versionName: string};
   /** All the docs of that version (unfiltered). */
-  docs: Array<{
+  docs: {
     id: string;
     title: string;
     frontMatter: DocFrontMatter & Record<string, unknown>;
     source: string;
     sourceDirName: string;
     sidebarPosition?: number | undefined;
-  }>;
+  }[];
   /** Number prefix parser configured for this plugin. */
   numberPrefixParser: PrefixParser;
   /** The default category index matcher which you can override. */
diff --git a/website/docs/api/plugins/plugin-pwa.md b/website/docs/api/plugins/plugin-pwa.md
index 1a7ab67bbe01..7dc019fe97fb 100644
--- a/website/docs/api/plugins/plugin-pwa.md
+++ b/website/docs/api/plugins/plugin-pwa.md
@@ -112,8 +112,8 @@ Turn debug mode on:
 
 ### `offlineModeActivationStrategies` {#offlinemodeactivationstrategies}
 
-- Type: `Array<'appInstalled' | 'mobile' | 'saveData'| 'queryString' | 'always'>`
-- Default: `['appInstalled','queryString','standalone']`
+- Type: `('appInstalled' | 'mobile' | 'saveData'| 'queryString' | 'always')[]`
+- Default: `['appInstalled', 'queryString', 'standalone']`
 
 Strategies used to turn the offline mode on:
 
@@ -194,7 +194,7 @@ The default theme includes an implementation for the reload popup and uses [Infi
 
 ### `pwaHead` {#pwahead}
 
-- Type: `Array<{ tagName: string } & Record<string,string>>`
+- Type: `({ tagName: string; [attributeName: string]: string })[]`
 - Default: `[]`
 
 Array of objects containing `tagName` and key-value pairs for attributes to inject into the `<head>` tag. Technically you can inject any head tag through this, but it's ideally used for tags to make your site PWA compliant. Here's a list of tag to make your app fully compliant:
diff --git a/website/docs/guides/markdown-features/markdown-features-toc.mdx b/website/docs/guides/markdown-features/markdown-features-toc.mdx
index 18e2d5d17614..1cc1ed43d27c 100644
--- a/website/docs/guides/markdown-features/markdown-features-toc.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-toc.mdx
@@ -83,11 +83,11 @@ import TOCInline from '@theme/TOCInline';
 The `toc` global is just a list of heading items:
 
 ```ts
-declare const toc: Array<{
+declare const toc: {
   value: string;
   id: string;
   level: number;
-}>;
+}[];
 ```
 
 Note that the `toc` global is a flat array, so you can easily cut out unwanted nodes or insert extra nodes, and create a new TOC tree.

From 5fcb742aa1a378833e83607f8ca7249db8fce261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.oster94@gmail.com>
Date: Wed, 25 May 2022 12:41:05 +0200
Subject: [PATCH 02/16] feat(theme-classic): allow className as option for
 type: "search" (#7357)

* feat(theme-classic): allow className as option for type: "search"

* fixup! feat(theme-classic): allow className as option for type: "search"

* refactor

Co-authored-by: Jan Peer Stoecklmair <jan.peer.stoecklmair@dynatrace.com>
Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 .../src/__tests__/validateThemeConfig.test.ts             | 6 ++++++
 packages/docusaurus-theme-classic/src/theme-classic.d.ts  | 2 ++
 .../src/theme/Navbar/Content/index.tsx                    | 4 ++--
 .../src/theme/Navbar/Search/index.tsx                     | 8 ++++++--
 .../src/theme/NavbarItem/SearchNavbarItem.tsx             | 7 +++++--
 .../docusaurus-theme-classic/src/validateThemeConfig.ts   | 1 +
 website/docs/api/themes/theme-configuration.md            | 1 +
 7 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
index da76d5edd34e..850eeb044255 100644
--- a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
+++ b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
@@ -243,6 +243,12 @@ describe('themeConfig', () => {
             position: 'left',
             label: 'Current version',
           },
+          // Search with className
+          {
+            type: 'search',
+            position: 'right',
+            className: 'search-bar-wrapper',
+          },
         ],
       },
     };
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index bc9b9c9bbaf3..82ebfdf45d1b 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -777,6 +777,7 @@ declare module '@theme/Navbar/Search' {
 
   export interface Props {
     readonly children: ReactNode;
+    readonly className?: string;
   }
 
   export default function NavbarSearch(props: Props): JSX.Element;
@@ -834,6 +835,7 @@ declare module '@theme/NavbarItem/DropdownNavbarItem' {
 declare module '@theme/NavbarItem/SearchNavbarItem' {
   export interface Props {
     readonly mobile?: boolean;
+    readonly className?: string;
   }
 
   export default function SearchNavbarItem(props: Props): JSX.Element;
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
index cf087e6cefd5..c81437a3fa8b 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
@@ -56,7 +56,7 @@ export default function NavbarContent(): JSX.Element {
   const items = useNavbarItems();
   const [leftItems, rightItems] = splitNavbarItems(items);
 
-  const autoAddSearchBar = !items.some((item) => item.type === 'search');
+  const searchBarItem = items.find((item) => item.type === 'search');
 
   return (
     <NavbarContentLayout
@@ -74,7 +74,7 @@ export default function NavbarContent(): JSX.Element {
         <>
           <NavbarItems items={rightItems} />
           <NavbarColorModeToggle className={styles.colorModeToggle} />
-          {autoAddSearchBar && (
+          {!searchBarItem && (
             <NavbarSearch>
               <SearchBar />
             </NavbarSearch>
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
index 8d3fe1b19d2f..236d237aa082 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Search/index.tsx
@@ -6,10 +6,14 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
 import type {Props} from '@theme/Navbar/Search';
 
 import styles from './styles.module.css';
 
-export default function NavbarSearch({children}: Props): JSX.Element {
-  return <div className={styles.searchBox}>{children}</div>;
+export default function NavbarSearch({
+  children,
+  className,
+}: Props): JSX.Element {
+  return <div className={clsx(className, styles.searchBox)}>{children}</div>;
 }
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx
index 9e95436025b2..f401f8f17621 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx
@@ -10,13 +10,16 @@ import SearchBar from '@theme/SearchBar';
 import NavbarSearch from '@theme/Navbar/Search';
 import type {Props} from '@theme/NavbarItem/SearchNavbarItem';
 
-export default function SearchNavbarItem({mobile}: Props): JSX.Element | null {
+export default function SearchNavbarItem({
+  mobile,
+  className,
+}: Props): JSX.Element | null {
   if (mobile) {
     return null;
   }
 
   return (
-    <NavbarSearch>
+    <NavbarSearch className={className}>
       <SearchBar />
     </NavbarSearch>
   );
diff --git a/packages/docusaurus-theme-classic/src/validateThemeConfig.ts b/packages/docusaurus-theme-classic/src/validateThemeConfig.ts
index d5bdb78e53e7..d64b671f0270 100644
--- a/packages/docusaurus-theme-classic/src/validateThemeConfig.ts
+++ b/packages/docusaurus-theme-classic/src/validateThemeConfig.ts
@@ -200,6 +200,7 @@ const LocaleDropdownNavbarItemSchema = NavbarItemBaseSchema.append({
 
 const SearchItemSchema = Joi.object({
   type: Joi.string().equal('search').required(),
+  className: Joi.string(),
 });
 
 const NavbarItemSchema = Joi.object({
diff --git a/website/docs/api/themes/theme-configuration.md b/website/docs/api/themes/theme-configuration.md
index 02e3c66db8f5..d1291bbc3cbc 100644
--- a/website/docs/api/themes/theme-configuration.md
+++ b/website/docs/api/themes/theme-configuration.md
@@ -602,6 +602,7 @@ However, with this special navbar item type, you can change the default location
 | --- | --- | --- | --- |
 | `type` | `'search'` | **Required** | Sets the type of this item to a search bar. |
 | `position` | <code>'left' \| 'right'</code> | `'left'` | The side of the navbar this item should appear on. |
+| `className` | `string` | / | Custom CSS class for this navbar item. |
 
 </APITable>
 

From f609acab4f4ea2bf001432e216c3ddb3f362abdf Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Thu, 26 May 2022 01:01:29 +0800
Subject: [PATCH 03/16] fix(theme-classic): consistently apply the right active
 class name for all navbar items (#7430)

---
 .../src/getSwizzleConfig.ts                      |  7 -------
 .../src/theme-classic.d.ts                       | 14 ++------------
 .../src/theme/NavbarItem/DefaultNavbarItem.tsx   |  5 +++--
 .../src/theme/NavbarItem/DocNavbarItem.tsx       | 16 ++++------------
 .../theme/NavbarItem/DocSidebarNavbarItem.tsx    |  9 +--------
 .../NavbarItem/DocsVersionDropdownNavbarItem.tsx |  1 -
 .../src/theme/NavbarItem/DropdownNavbarItem.tsx  | 12 ++++++------
 .../LocaleDropdownNavbarItem/index.tsx           | 12 ++++++++++--
 .../src/theme/NavbarItem/NavbarNavLink.tsx       |  8 +-------
 .../src/theme/NavbarItem/utils.ts                | 13 -------------
 10 files changed, 27 insertions(+), 70 deletions(-)
 delete mode 100644 packages/docusaurus-theme-classic/src/theme/NavbarItem/utils.ts

diff --git a/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts b/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts
index 0c34618bdc32..a0549256e98f 100644
--- a/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts
+++ b/packages/docusaurus-theme-classic/src/getSwizzleConfig.ts
@@ -214,13 +214,6 @@ export default function getSwizzleConfig(): SwizzleConfig {
         description:
           'The Navbar item components mapping. Can be ejected to add custom navbar item types. See https://github.com/facebook/docusaurus/issues/7227.',
       },
-      // TODO should probably not even appear here
-      'NavbarItem/utils': {
-        actions: {
-          eject: 'forbidden',
-          wrap: 'forbidden',
-        },
-      },
       NotFound: {
         actions: {
           eject: 'safe',
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 82ebfdf45d1b..1986158d8e22 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -809,7 +809,8 @@ declare module '@theme/NavbarItem/NavbarNavLink' {
     readonly exact?: boolean;
     readonly label?: ReactNode;
     readonly html?: string;
-    readonly prependBaseUrlToHref?: string;
+    readonly prependBaseUrlToHref?: boolean;
+    readonly isDropdownLink?: boolean;
   }
 
   export default function NavbarNavLink(props: Props): JSX.Element;
@@ -982,17 +983,6 @@ declare module '@theme/NavbarItem' {
   export default function NavbarItem(props: Props): JSX.Element;
 }
 
-declare module '@theme/NavbarItem/utils' {
-  /**
-   * On desktop and mobile, we would apply different class names for dropdown
-   * items.
-   * @see https://github.com/facebook/docusaurus/pull/5431
-   */
-  export function getInfimaActiveClassName(
-    mobile?: boolean,
-  ): `${'menu' | 'navbar'}__link--active`;
-}
-
 declare module '@theme/PaginatorNavLink' {
   import type {ReactNode} from 'react';
   import type {PropNavigationLink} from '@docusaurus/plugin-content-docs';
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx
index 7036b2b6c12e..948d6507d7bc 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx
@@ -8,7 +8,6 @@
 import React from 'react';
 import clsx from 'clsx';
 import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
-import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
 import type {
   DesktopOrMobileNavBarItemProps,
   Props,
@@ -25,6 +24,7 @@ function DefaultNavbarItemDesktop({
         isDropdownItem ? 'dropdown__link' : 'navbar__item navbar__link',
         className,
       )}
+      isDropdownLink={isDropdownItem}
       {...props}
     />
   );
@@ -58,7 +58,8 @@ export default function DefaultNavbarItem({
     <Comp
       {...props}
       activeClassName={
-        props.activeClassName ?? getInfimaActiveClassName(mobile)
+        props.activeClassName ??
+        (mobile ? 'menu__link--active' : 'navbar__link--active')
       }
     />
   );
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx
index 797ef1ec2d50..76df1591ba90 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx
@@ -6,11 +6,9 @@
  */
 
 import React from 'react';
-import clsx from 'clsx';
 import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import {useLayoutDoc} from '@docusaurus/theme-common';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
 import type {Props} from '@theme/NavbarItem/DocNavbarItem';
 
 export default function DocNavbarItem({
@@ -27,20 +25,14 @@ export default function DocNavbarItem({
     return null;
   }
 
-  const activeDocInfimaClassName = getInfimaActiveClassName(props.mobile);
-
   return (
     <DefaultNavbarItem
       exact
       {...props}
-      className={clsx(props.className, {
-        [activeDocInfimaClassName]:
-          // Do not make the item active if the active doc doesn't have sidebar.
-          // If `activeDoc === doc` react-router will make it active anyways,
-          // regardless of the existence of a sidebar
-          activeDoc?.sidebar && activeDoc.sidebar === doc.sidebar,
-      })}
-      activeClassName={activeDocInfimaClassName}
+      isActive={() =>
+        activeDoc?.path === doc.path ||
+        (!!activeDoc?.sidebar && activeDoc.sidebar === doc.sidebar)
+      }
       label={staticLabel ?? doc.id}
       to={doc.path}
     />
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx
index 874605bcf1a1..08771f8aa6c7 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx
@@ -6,11 +6,9 @@
  */
 
 import React from 'react';
-import clsx from 'clsx';
 import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import {useLayoutDocsSidebar} from '@docusaurus/theme-common';
 import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
 import type {Props} from '@theme/NavbarItem/DocSidebarNavbarItem';
 
 export default function DocSidebarNavbarItem({
@@ -26,16 +24,11 @@ export default function DocSidebarNavbarItem({
       `DocSidebarNavbarItem: Sidebar with ID "${sidebarId}" doesn't have anything to be linked to.`,
     );
   }
-  const activeDocInfimaClassName = getInfimaActiveClassName(props.mobile);
-
   return (
     <DefaultNavbarItem
       exact
       {...props}
-      className={clsx(props.className, {
-        [activeDocInfimaClassName]: activeDoc?.sidebar === sidebarId,
-      })}
-      activeClassName={activeDocInfimaClassName}
+      isActive={() => activeDoc?.sidebar === sidebarId}
       label={label ?? sidebarLink.label}
       to={sidebarLink.path}
     />
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
index 47903ce0aa35..8893306f7abd 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
@@ -41,7 +41,6 @@ export default function DocsVersionDropdownNavbarItem({
       activeDocContext.alternateDocVersions[version.name] ??
       getVersionMainDoc(version);
     return {
-      isNavLink: true,
       label: version.label,
       to: versionDoc.path,
       isActive: () => version === activeDocContext.activeVersion,
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
index 45c61dac60e7..3678d9d0bb03 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
@@ -21,8 +21,6 @@ import type {
   Props,
 } from '@theme/NavbarItem/DropdownNavbarItem';
 
-const dropdownLinkActiveClass = 'dropdown__link--active';
-
 function isItemActive(
   item: LinkLikeNavbarItemProps,
   localPathname: string,
@@ -50,6 +48,7 @@ function DropdownNavbarItemDesktop({
   items,
   position,
   className,
+  onClick,
   ...props
 }: DesktopOrMobileNavBarItemProps) {
   const dropdownRef = useRef<HTMLDivElement>(null);
@@ -113,12 +112,12 @@ function DropdownNavbarItemDesktop({
                       ? nextNavbarItem
                       : // Next item is another dropdown; focus on the inner
                         // anchor element instead so there's outline
-                        nextNavbarItem.querySelector('a');
-                  (targetItem as HTMLElement).focus();
+                        nextNavbarItem.querySelector('a')!;
+                  targetItem.focus();
                 }
               }
             }}
-            activeClassName={dropdownLinkActiveClass}
+            activeClassName="dropdown__link--active"
             {...childItemProps}
             key={i}
           />
@@ -132,6 +131,7 @@ function DropdownNavbarItemMobile({
   items,
   className,
   position, // Need to destructure position from props so that it doesn't get passed on.
+  onClick,
   ...props
 }: DesktopOrMobileNavBarItemProps) {
   const localPathname = useLocalPathname();
@@ -171,7 +171,7 @@ function DropdownNavbarItemMobile({
           <NavbarItem
             mobile
             isDropdownItem
-            onClick={props.onClick}
+            onClick={onClick}
             activeClassName="menu__link--active"
             {...childItemProps}
             key={i}
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx
index 2bb652c734ac..3e6a20838393 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx
@@ -33,12 +33,20 @@ export default function LocaleDropdownNavbarItem({
       fullyQualified: false,
     })}`;
     return {
-      isNavLink: true,
       label: localeConfigs[locale]!.label,
       to,
       target: '_self',
       autoAddBaseUrl: false,
-      className: locale === currentLocale ? 'dropdown__link--active' : '',
+      className:
+        // eslint-disable-next-line no-nested-ternary
+        locale === currentLocale
+          ? // Similar idea as DefaultNavbarItem: select the right Infima active
+            // class name. This cannot be substituted with isActive, because the
+            // target URLs contain `pathname://` and therefore are not NavLinks!
+            mobile
+            ? 'menu__link--active'
+            : 'dropdown__link--active'
+          : '',
     };
   });
 
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx
index 94157e97eec5..050c6ed5c7f7 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx
@@ -13,8 +13,6 @@ import {isRegexpStringMatch} from '@docusaurus/theme-common';
 import IconExternalLink from '@theme/IconExternalLink';
 import type {Props} from '@theme/NavbarItem/NavbarNavLink';
 
-const dropdownLinkActiveClass = 'dropdown__link--active';
-
 export default function NavbarNavLink({
   activeBasePath,
   activeBaseRegex,
@@ -22,7 +20,7 @@ export default function NavbarNavLink({
   href,
   label,
   html,
-  activeClassName = '',
+  isDropdownLink,
   prependBaseUrlToHref,
   ...props
 }: Props): JSX.Element {
@@ -32,7 +30,6 @@ export default function NavbarNavLink({
   const activeBaseUrl = useBaseUrl(activeBasePath);
   const normalizedHref = useBaseUrl(href, {forcePrependBaseUrl: true});
   const isExternalLink = label && href && !isInternalUrl(href);
-  const isDropdownLink = activeClassName === dropdownLinkActiveClass;
 
   // Link content is set through html XOR label
   const linkContentProps = html
@@ -64,9 +61,6 @@ export default function NavbarNavLink({
     <Link
       to={toUrl}
       isNavLink
-      activeClassName={
-        !props.className?.includes(activeClassName) ? activeClassName : ''
-      }
       {...((activeBasePath || activeBaseRegex) && {
         isActive: (_match, location) =>
           activeBaseRegex
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/utils.ts b/packages/docusaurus-theme-classic/src/theme/NavbarItem/utils.ts
deleted file mode 100644
index a98db455f25e..000000000000
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/utils.ts
+++ /dev/null
@@ -1,13 +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.
- */
-
-/* eslint-disable import/no-named-export */
-
-export const getInfimaActiveClassName = (
-  mobile?: boolean,
-): `${'menu' | 'navbar'}__link--active` =>
-  mobile ? 'menu__link--active' : 'navbar__link--active';

From 89ddc6d258d1ad8ddb48bf9760abeda38b12a931 Mon Sep 17 00:00:00 2001
From: James <5511220+Zamiell@users.noreply.github.com>
Date: Thu, 26 May 2022 01:02:32 -0400
Subject: [PATCH 04/16] misc: avoid using fs.realpathSync in website (#7496)

* dogfood fix

* remove other mentions

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 website/_dogfooding/README.md            | 1 -
 website/_dogfooding/docs-tests-symlink   | 1 -
 website/_dogfooding/dogfooding.config.js | 8 ++------
 3 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 120000 website/_dogfooding/docs-tests-symlink

diff --git a/website/_dogfooding/README.md b/website/_dogfooding/README.md
index 0b6ba0b479f0..8acadfac2e9b 100644
--- a/website/_dogfooding/README.md
+++ b/website/_dogfooding/README.md
@@ -11,7 +11,6 @@ Eventually, we could move these tests later so another test site? Note there is
 Fancy things we can test for here:
 
 - Plugin Multi-instance
-- Symlinks support
 - Webpack configs
 - \_ prefix convention
 - Huge sidebars impact
diff --git a/website/_dogfooding/docs-tests-symlink b/website/_dogfooding/docs-tests-symlink
deleted file mode 120000
index 4a3222e9fd36..000000000000
--- a/website/_dogfooding/docs-tests-symlink
+++ /dev/null
@@ -1 +0,0 @@
-_docs tests
\ No newline at end of file
diff --git a/website/_dogfooding/dogfooding.config.js b/website/_dogfooding/dogfooding.config.js
index 95c1d5161843..b6239f787b42 100644
--- a/website/_dogfooding/dogfooding.config.js
+++ b/website/_dogfooding/dogfooding.config.js
@@ -5,8 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-const fs = require('fs');
-
 /** @type {import('@docusaurus/types').PluginConfig[]} */
 const dogfoodingThemeInstances = [
   /** @type {import('@docusaurus/types').PluginModule} */
@@ -29,10 +27,8 @@ const dogfoodingPluginInstances = [
       routeBasePath: '/tests/docs',
       sidebarPath: '_dogfooding/docs-tests-sidebars.js',
 
-      // Using a symlinked folder as source, test for use-case https://github.com/facebook/docusaurus/issues/3272
-      // The target folder uses a _ prefix to test against an edge case regarding MDX partials: https://github.com/facebook/docusaurus/discussions/5181#discussioncomment-1018079
-      // eslint-disable-next-line no-restricted-properties
-      path: fs.realpathSync('_dogfooding/docs-tests-symlink'),
+      // Using a _ prefix to test against an edge case regarding MDX partials: https://github.com/facebook/docusaurus/discussions/5181#discussioncomment-1018079
+      path: '_dogfooding/_docs tests',
       showLastUpdateTime: true,
       sidebarItemsGenerator(args) {
         return args.defaultSidebarItemsGenerator({

From f94701569b35f8ee59a02580c60ff7c34acbb7b0 Mon Sep 17 00:00:00 2001
From: James <5511220+Zamiell@users.noreply.github.com>
Date: Thu, 26 May 2022 03:06:22 -0400
Subject: [PATCH 05/16] fix: avoid printing period after localhost URL (#7499)

* fix: output of URL

* fix: adding formatting to start.ts
---
 packages/docusaurus/src/commands/serve.ts | 4 ++--
 packages/docusaurus/src/commands/start.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/docusaurus/src/commands/serve.ts b/packages/docusaurus/src/commands/serve.ts
index 64845cb5ced4..7777d448f734 100644
--- a/packages/docusaurus/src/commands/serve.ts
+++ b/packages/docusaurus/src/commands/serve.ts
@@ -76,8 +76,8 @@ export async function serve(
     });
   });
 
-  logger.success`Serving path=${buildDir} directory at url=${
+  logger.success`Serving path=${buildDir} directory at: url=${
     servingUrl + baseUrl
-  }.`;
+  }`;
   server.listen(port);
 }
diff --git a/packages/docusaurus/src/commands/start.ts b/packages/docusaurus/src/commands/start.ts
index a0cae8416493..f49874839d68 100644
--- a/packages/docusaurus/src/commands/start.ts
+++ b/packages/docusaurus/src/commands/start.ts
@@ -67,7 +67,7 @@ export async function start(
   const urls = prepareUrls(protocol, host, port);
   const openUrl = normalizeUrl([urls.localUrlForBrowser, baseUrl]);
 
-  logger.success`Docusaurus website is running at url=${openUrl}.`;
+  logger.success`Docusaurus website is running at: url=${openUrl}`;
 
   // Reload files processing.
   const reload = _.debounce(() => {
@@ -75,7 +75,7 @@ export async function start(
       .then(({baseUrl: newBaseUrl}) => {
         const newOpenUrl = normalizeUrl([urls.localUrlForBrowser, newBaseUrl]);
         if (newOpenUrl !== openUrl) {
-          logger.success`Docusaurus website is running at url=${newOpenUrl}.`;
+          logger.success`Docusaurus website is running at: url=${newOpenUrl}`;
         }
       })
       .catch((err: Error) => {

From 4f97c7b52c5621af201a62912848b73ddcdf4b7a Mon Sep 17 00:00:00 2001
From: James <5511220+Zamiell@users.noreply.github.com>
Date: Thu, 26 May 2022 03:06:36 -0400
Subject: [PATCH 06/16] docs: link every reference of types in API table to the
 type definition (#7497)

* dogfood fix

* feat: links for plugin types

* better syntax

* little refactor

* use code title

* complete the rest

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 .../api/plugins/plugin-client-redirects.md    | 12 ++++-
 .../docs/api/plugins/plugin-content-blog.md   | 24 +++++++---
 .../docs/api/plugins/plugin-content-docs.md   | 48 +++++++++++++------
 3 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/website/docs/api/plugins/plugin-client-redirects.md b/website/docs/api/plugins/plugin-client-redirects.md
index 3b881f58810a..991ea778ad91 100644
--- a/website/docs/api/plugins/plugin-client-redirects.md
+++ b/website/docs/api/plugins/plugin-client-redirects.md
@@ -41,17 +41,25 @@ Accepted fields:
 | --- | --- | --- | --- |
 | `fromExtensions` | `string[]` | `[]` | The extensions to be removed from the route after redirecting. |
 | `toExtensions` | `string[]` | `[]` | The extensions to be appended to the route after redirecting. |
-| `redirects` | `RedirectRule[]` | `[]` | The list of redirect rules. |
-| `createRedirects` | `CreateRedirectsFn` | `undefined` | A callback to create a redirect rule. |
+| `redirects` | <code><a href="#RedirectRule">RedirectRule</a>[]</code> | `[]` | The list of redirect rules. |
+| `createRedirects` | <code><a href="#CreateRedirectsFn">CreateRedirectsFn</a></code> | `undefined` | A callback to create a redirect rule. |
 
 </APITable>
 
+### Types {#types}
+
+#### `RedirectRule` {#RedirectRule}
+
 ```ts
 type RedirectRule = {
   to: string;
   from: string | string[];
 };
+```
 
+#### `CreateRedirectsFn` {#CreateRedirectsFn}
+
+```ts
 type CreateRedirectsFn = (path: string) => string[] | string | null | undefined;
 ```
 
diff --git a/website/docs/api/plugins/plugin-content-blog.md b/website/docs/api/plugins/plugin-content-blog.md
index 27db9055ecc6..8cdc51d7c668 100644
--- a/website/docs/api/plugins/plugin-content-blog.md
+++ b/website/docs/api/plugins/plugin-content-blog.md
@@ -38,7 +38,7 @@ Accepted fields:
 | Name | Type | Default | Description |
 | --- | --- | --- | --- |
 | `path` | `string` | `'blog'` | Path to the blog content directory on the file system, relative to site dir. |
-| `editUrl` | <code>string \| EditUrlFunction</code> | `undefined` | Base URL to edit your site. The final URL is computed by `editUrl + relativePostPath`. Using a function allows more nuanced control for each file. Omitting this variable entirely will disable edit links. |
+| `editUrl` | <code>string \| <a href="#EditUrlFn">EditUrlFn</a></code> | `undefined` | Base URL to edit your site. The final URL is computed by `editUrl + relativePostPath`. Using a function allows more nuanced control for each file. Omitting this variable entirely will disable edit links. |
 | `editLocalizedFiles` | `boolean` | `false` | The edit URL will target the localized file, instead of the original unlocalized file. Ignored when `editUrl` is a function. |
 | `blogTitle` | `string` | `'Blog'` | Blog page title for better SEO. |
 | `blogDescription` | `string` | `'Blog'` | Blog page meta description for better SEO. |
@@ -61,10 +61,10 @@ Accepted fields:
 | `beforeDefaultRehypePlugins` | `any[]` | `[]` | Custom Rehype plugins passed to MDX before the default Docusaurus Rehype plugins. |
 | `truncateMarker` | `RegExp` | `/<!--\s*(truncate)\s*-->/` | Truncate marker marking where the summary ends. |
 | `showReadingTime` | `boolean` | `true` | Show estimated reading time for the blog post. |
-| `readingTime` | `ReadingTimeFunctionOption` | The default reading time | A callback to customize the reading time number displayed. |
+| `readingTime` | `ReadingTimeFn` | The default reading time | A callback to customize the reading time number displayed. |
 | `authorsMapPath` | `string` | `'authors.yml'` | Path to the authors map file, relative to the blog content directory. |
 | `feedOptions` | _See below_ | `{type: ['rss', 'atom']}` | Blog feed. |
-| `feedOptions.type` | <code>FeedType \| FeedType[] \| 'all' \| null</code> | **Required** | Type of feed to be generated. Use `null` to disable generation. |
+| `feedOptions.type` | <code><a href="#FeedType">FeedType</a> \| <a href="#FeedType">FeedType</a>[] \| 'all' \| null</code> | **Required** | Type of feed to be generated. Use `null` to disable generation. |
 | `feedOptions.title` | `string` | `siteConfig.title` | Title of the feed. |
 | `feedOptions.description` | `string` | <code>\`${siteConfig.title} Blog\`</code> | Description of the feed. |
 | `feedOptions.copyright` | `string` | `undefined` | Copyright message. |
@@ -73,6 +73,10 @@ Accepted fields:
 
 </APITable>
 
+### Types {#types}
+
+#### `EditUrlFn` {#EditUrlFn}
+
 ```ts
 type EditUrlFunction = (params: {
   blogDirPath: string;
@@ -80,24 +84,32 @@ type EditUrlFunction = (params: {
   permalink: string;
   locale: string;
 }) => string | undefined;
+```
+
+#### `ReadingTimeFn` {#ReadingTimeFn}
 
+```ts
 type ReadingTimeOptions = {
   wordsPerMinute: number;
   wordBound: (char: string) => boolean;
 };
 
-type ReadingTimeFunction = (params: {
+type ReadingTimeCalculator = (params: {
   content: string;
   frontMatter?: BlogPostFrontMatter & Record<string, unknown>;
   options?: ReadingTimeOptions;
 }) => number;
 
-type ReadingTimeFunctionOption = (params: {
+type ReadingTimeFn = (params: {
   content: string;
   frontMatter: BlogPostFrontMatter & Record<string, unknown>;
-  defaultReadingTime: ReadingTimeFunction;
+  defaultReadingTime: ReadingTimeCalculator;
 }) => number | undefined;
+```
 
+#### `FeedType` {#FeedType}
+
+```ts
 type FeedType = 'rss' | 'atom' | 'json';
 ```
 
diff --git a/website/docs/api/plugins/plugin-content-docs.md b/website/docs/api/plugins/plugin-content-docs.md
index 331c7cb0a9f9..a44ce3ca1a5a 100644
--- a/website/docs/api/plugins/plugin-content-docs.md
+++ b/website/docs/api/plugins/plugin-content-docs.md
@@ -32,7 +32,7 @@ Accepted fields:
 | Name | Type | Default | Description |
 | --- | --- | --- | --- |
 | `path` | `string` | `'docs'` | Path to the docs content directory on the file system, relative to site directory. |
-| `editUrl` | <code>string \| EditUrlFunction</code> | `undefined` | Base URL to edit your site. The final URL is computed by `editUrl + relativeDocPath`. Using a function allows more nuanced control for each file. Omitting this variable entirely will disable edit links. |
+| `editUrl` | <code>string \| <a href="#EditUrlFunction">EditUrlFunction</a></code> | `undefined` | Base URL to edit your site. The final URL is computed by `editUrl + relativeDocPath`. Using a function allows more nuanced control for each file. Omitting this variable entirely will disable edit links. |
 | `editLocalizedFiles` | `boolean` | `false` | The edit URL will target the localized file, instead of the original unlocalized file. Ignored when `editUrl` is a function. |
 | `editCurrentVersion` | `boolean` | `false` | The edit URL will always target the current version doc instead of older versions. Ignored when `editUrl` is a function. |
 | `routeBasePath` | `string` | `'docs'` | URL route for the docs section of your site. **DO NOT** include a trailing slash. Use `/` for shipping docs without base path. |
@@ -42,8 +42,8 @@ Accepted fields:
 | `sidebarPath` | <code>false \| string</code> | `undefined` | Path to sidebar configuration. Use `false` to disable sidebars, or `undefined` to create a fully autogenerated sidebar. |
 | `sidebarCollapsible` | `boolean` | `true` | Whether sidebar categories are collapsible by default. See also [Collapsible categories](/docs/sidebar#collapsible-categories) |
 | `sidebarCollapsed` | `boolean` | `true` | Whether sidebar categories are collapsed by default. See also [Expanded categories by default](/docs/sidebar#expanded-categories-by-default) |
-| `sidebarItemsGenerator` | `SidebarGenerator` | _Omitted_ | Function used to replace the sidebar items of type `'autogenerated'` with real sidebar items (docs, categories, links...). See also [Customize the sidebar items generator](/docs/sidebar#customize-the-sidebar-items-generator) |
-| `numberPrefixParser` | <code>boolean \| PrefixParser</code> | _Omitted_ | Custom parsing logic to extract number prefixes from file names. Use `false` to disable this behavior and leave the docs untouched, and `true` to use the default parser. See also [Using number prefixes](/docs/sidebar#using-number-prefixes) |
+| `sidebarItemsGenerator` | <a href="#SidebarGenerator"><code>SidebarGenerator</code></a> | _Omitted_ | Function used to replace the sidebar items of type `'autogenerated'` with real sidebar items (docs, categories, links...). See also [Customize the sidebar items generator](/docs/sidebar#customize-the-sidebar-items-generator) |
+| `numberPrefixParser` | <code>boolean \|</code> <a href="#PrefixParser"><code>PrefixParser</code></a> | _Omitted_ | Custom parsing logic to extract number prefixes from file names. Use `false` to disable this behavior and leave the docs untouched, and `true` to use the default parser. See also [Using number prefixes](/docs/sidebar#using-number-prefixes) |
 | `docLayoutComponent` | `string` | `'@theme/DocPage'` | Root layout component of each doc page. Provides the version data context, and is not unmounted when switching docs. |
 | `docItemComponent` | `string` | `'@theme/DocItem'` | Main doc container, with TOC, pagination, etc. |
 | `docTagsListComponent` | `string` | `'@theme/DocTagsListPage'` | Root component of the tags list page |
@@ -60,10 +60,14 @@ Accepted fields:
 | `includeCurrentVersion` | `boolean` | `true` | Include the current version of your docs. |
 | `lastVersion` | `string` | First version in `versions.json` | The version navigated to in priority and displayed by default for docs navbar items. |
 | `onlyIncludeVersions` | `string[]` | All versions available | Only include a subset of all available versions. |
-| `versions` | `VersionsConfig` | `{}` | Independent customization of each version's properties. |
+| `versions` | <a href="#VersionsConfig"><code>VersionsConfig</code></a> | `{}` | Independent customization of each version's properties. |
 
 </APITable>
 
+### Types {#types}
+
+#### `EditUrlFunction` {#EditUrlFunction}
+
 ```ts
 type EditUrlFunction = (params: {
   version: string;
@@ -72,24 +76,20 @@ type EditUrlFunction = (params: {
   permalink: string;
   locale: string;
 }) => string | undefined;
+```
 
+#### `PrefixParser` {#PrefixParser}
+
+```ts
 type PrefixParser = (filename: string) => {
   filename: string;
   numberPrefix?: number;
 };
+```
 
-type CategoryIndexMatcher = (param: {
-  /** The file name, without extension */
-  fileName: string;
-  /**
-   * The list of directories, from lowest level to highest.
-   * If there's no dir name, directories is ['.']
-   */
-  directories: string[];
-  /** The extension, with a leading dot */
-  extension: string;
-}) => boolean;
+#### `SidebarGenerator` {#SidebarGenerator}
 
+```ts
 type SidebarGenerator = (generatorArgs: {
   /** The sidebar item with type "autogenerated" to be transformed. */
   item: {type: 'autogenerated'; dirName: string};
@@ -118,8 +118,26 @@ type SidebarGenerator = (generatorArgs: {
    * Docusaurus.
    */
   defaultSidebarItemsGenerator: SidebarGenerator;
+  // Returns an array of sidebar items — same as what you can declare in
+  // sidebars.js, except for shorthands. See https://docusaurus.io/docs/sidebar/items
 }) => Promise<SidebarItem[]>;
 
+type CategoryIndexMatcher = (param: {
+  /** The file name, without extension */
+  fileName: string;
+  /**
+   * The list of directories, from lowest level to highest.
+   * If there's no dir name, directories is ['.']
+   */
+  directories: string[];
+  /** The extension, with a leading dot */
+  extension: string;
+}) => boolean;
+```
+
+#### `VersionsConfig` {#VersionsConfig}
+
+```ts
 type VersionsConfig = {
   [versionName: string]: {
     /**

From 47a2cca17df1c83638b421da6b77c3b9faa4dbef Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Thu, 26 May 2022 17:44:18 +0800
Subject: [PATCH 07/16] chore: require Node 16.14 (#7501)

---
 .github/workflows/tests-e2e.yml                          | 2 +-
 .github/workflows/tests-windows.yml                      | 2 +-
 .github/workflows/tests.yml                              | 2 +-
 .nvmrc                                                   | 2 +-
 packages/create-docusaurus/package.json                  | 2 +-
 packages/docusaurus-cssnano-preset/package.json          | 3 +++
 packages/docusaurus-logger/package.json                  | 2 +-
 packages/docusaurus-mdx-loader/package.json              | 2 +-
 packages/docusaurus-migrate/package.json                 | 2 +-
 packages/docusaurus-plugin-client-redirects/package.json | 2 +-
 packages/docusaurus-plugin-content-blog/package.json     | 2 +-
 packages/docusaurus-plugin-content-docs/package.json     | 2 +-
 packages/docusaurus-plugin-content-pages/package.json    | 2 +-
 packages/docusaurus-plugin-debug/package.json            | 2 +-
 packages/docusaurus-plugin-google-analytics/package.json | 2 +-
 packages/docusaurus-plugin-google-gtag/package.json      | 2 +-
 packages/docusaurus-plugin-ideal-image/package.json      | 2 +-
 packages/docusaurus-plugin-pwa/package.json              | 3 +++
 packages/docusaurus-plugin-sitemap/package.json          | 2 +-
 packages/docusaurus-preset-classic/package.json          | 2 +-
 packages/docusaurus-remark-plugin-npm2yarn/package.json  | 2 +-
 packages/docusaurus-theme-classic/package.json           | 2 +-
 packages/docusaurus-theme-common/package.json            | 2 +-
 packages/docusaurus-theme-live-codeblock/package.json    | 2 +-
 packages/docusaurus-theme-search-algolia/package.json    | 2 +-
 packages/docusaurus-theme-translations/package.json      | 2 +-
 packages/docusaurus-utils-common/package.json            | 2 +-
 packages/docusaurus-utils-validation/package.json        | 2 +-
 packages/docusaurus-utils/package.json                   | 2 +-
 packages/docusaurus/package.json                         | 2 +-
 packages/eslint-plugin/package.json                      | 2 +-
 packages/lqip-loader/package.json                        | 2 +-
 website/docs/installation.md                             | 2 +-
 33 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml
index f10f08f65786..92b9f5319f84 100644
--- a/.github/workflows/tests-e2e.yml
+++ b/.github/workflows/tests-e2e.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['14', '16', '18']
+        node: ['16.14', '16', '18']
     steps:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml
index 186833e7d080..d4dbaef8da9f 100644
--- a/.github/workflows/tests-windows.yml
+++ b/.github/workflows/tests-windows.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        node: ['14', '16', '18']
+        node: ['16.14', '16', '18']
     steps:
       - name: Support longpaths
         run: git config --system core.longpaths true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a078a2bf3639..502a4812fd64 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['14', '16', '18']
+        node: ['16.14', '16', '18']
     steps:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
diff --git a/.nvmrc b/.nvmrc
index 832d38506443..3c032078a4a2 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16.14.0
+18
diff --git a/packages/create-docusaurus/package.json b/packages/create-docusaurus/package.json
index d7a60dba1c13..46ae2253e1b4 100755
--- a/packages/create-docusaurus/package.json
+++ b/packages/create-docusaurus/package.json
@@ -36,6 +36,6 @@
     "@types/supports-color": "^8.1.1"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-cssnano-preset/package.json b/packages/docusaurus-cssnano-preset/package.json
index 6469eba2405a..aec575bf1c3b 100644
--- a/packages/docusaurus-cssnano-preset/package.json
+++ b/packages/docusaurus-cssnano-preset/package.json
@@ -24,5 +24,8 @@
   },
   "devDependencies": {
     "to-vfile": "^6.1.0"
+  },
+  "engines": {
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-logger/package.json b/packages/docusaurus-logger/package.json
index 6c91e0d029ec..2c6dcab1b1c8 100644
--- a/packages/docusaurus-logger/package.json
+++ b/packages/docusaurus-logger/package.json
@@ -24,7 +24,7 @@
     "tslib": "^2.4.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   },
   "devDependencies": {
     "@types/supports-color": "^8.1.1"
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
index b071b9732ba3..36e190295f02 100644
--- a/packages/docusaurus-mdx-loader/package.json
+++ b/packages/docusaurus-mdx-loader/package.json
@@ -52,6 +52,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-migrate/package.json b/packages/docusaurus-migrate/package.json
index 9d43bdcf7a73..2102cac885c8 100644
--- a/packages/docusaurus-migrate/package.json
+++ b/packages/docusaurus-migrate/package.json
@@ -4,7 +4,7 @@
   "description": "A CLI tool to migrate from older versions of Docusaurus.",
   "license": "MIT",
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   },
   "scripts": {
     "build": "tsc --build",
diff --git a/packages/docusaurus-plugin-client-redirects/package.json b/packages/docusaurus-plugin-client-redirects/package.json
index 426d13b139d2..b0a378708339 100644
--- a/packages/docusaurus-plugin-client-redirects/package.json
+++ b/packages/docusaurus-plugin-client-redirects/package.json
@@ -36,6 +36,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json
index 5d0dbade229e..85ce797f5e6e 100644
--- a/packages/docusaurus-plugin-content-blog/package.json
+++ b/packages/docusaurus-plugin-content-blog/package.json
@@ -44,6 +44,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index bf59cd020096..0a49a06e77ec 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -56,6 +56,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json
index 4e8e2eb7edf5..4ec059c3cfef 100644
--- a/packages/docusaurus-plugin-content-pages/package.json
+++ b/packages/docusaurus-plugin-content-pages/package.json
@@ -35,6 +35,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json
index 3382fcab737a..98f9c72f08cf 100644
--- a/packages/docusaurus-plugin-debug/package.json
+++ b/packages/docusaurus-plugin-debug/package.json
@@ -34,6 +34,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json
index f62db432005c..d97f66f979a6 100644
--- a/packages/docusaurus-plugin-google-analytics/package.json
+++ b/packages/docusaurus-plugin-google-analytics/package.json
@@ -30,6 +30,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json
index c353d7a1a28c..146b913d71da 100644
--- a/packages/docusaurus-plugin-google-gtag/package.json
+++ b/packages/docusaurus-plugin-google-gtag/package.json
@@ -30,6 +30,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index 5bda29fd0203..582127cb4bc9 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -47,6 +47,6 @@
     }
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json
index f47075267b29..429ae3f1b186 100644
--- a/packages/docusaurus-plugin-pwa/package.json
+++ b/packages/docusaurus-plugin-pwa/package.json
@@ -45,5 +45,8 @@
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
     "react-dom": "^16.8.4 || ^17.0.0"
+  },
+  "engines": {
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json
index deabe52f3741..f6fd11b8921b 100644
--- a/packages/docusaurus-plugin-sitemap/package.json
+++ b/packages/docusaurus-plugin-sitemap/package.json
@@ -35,6 +35,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json
index 310a920bf4db..40a209675956 100644
--- a/packages/docusaurus-preset-classic/package.json
+++ b/packages/docusaurus-preset-classic/package.json
@@ -35,6 +35,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-remark-plugin-npm2yarn/package.json b/packages/docusaurus-remark-plugin-npm2yarn/package.json
index a47e1de9c9e0..0c9c44fdc3a2 100644
--- a/packages/docusaurus-remark-plugin-npm2yarn/package.json
+++ b/packages/docusaurus-remark-plugin-npm2yarn/package.json
@@ -28,6 +28,6 @@
     "to-vfile": "^6.1.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 577babee2892..9439db4a2c40 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -58,6 +58,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-theme-common/package.json b/packages/docusaurus-theme-common/package.json
index ff097aa08e95..9e0208c32eb4 100644
--- a/packages/docusaurus-theme-common/package.json
+++ b/packages/docusaurus-theme-common/package.json
@@ -49,6 +49,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-theme-live-codeblock/package.json b/packages/docusaurus-theme-live-codeblock/package.json
index f107b6b8b302..4454d741c479 100644
--- a/packages/docusaurus-theme-live-codeblock/package.json
+++ b/packages/docusaurus-theme-live-codeblock/package.json
@@ -42,6 +42,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-theme-search-algolia/package.json b/packages/docusaurus-theme-search-algolia/package.json
index 6ec7ab36203a..518e0836e599 100644
--- a/packages/docusaurus-theme-search-algolia/package.json
+++ b/packages/docusaurus-theme-search-algolia/package.json
@@ -52,6 +52,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-theme-translations/package.json b/packages/docusaurus-theme-translations/package.json
index a296a446f3eb..5b10cbf18e24 100644
--- a/packages/docusaurus-theme-translations/package.json
+++ b/packages/docusaurus-theme-translations/package.json
@@ -28,6 +28,6 @@
     "lodash": "^4.17.21"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-utils-common/package.json b/packages/docusaurus-utils-common/package.json
index 31f9a3fcd0c8..9bdb0b8d122c 100644
--- a/packages/docusaurus-utils-common/package.json
+++ b/packages/docusaurus-utils-common/package.json
@@ -25,6 +25,6 @@
     "@docusaurus/types": "2.0.0-beta.20"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-utils-validation/package.json b/packages/docusaurus-utils-validation/package.json
index a112ef5797c4..9059249d9b04 100644
--- a/packages/docusaurus-utils-validation/package.json
+++ b/packages/docusaurus-utils-validation/package.json
@@ -25,6 +25,6 @@
     "tslib": "^2.4.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index 36dd648ff13d..4a460a57d648 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -35,7 +35,7 @@
     "webpack": "^5.72.1"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   },
   "devDependencies": {
     "@docusaurus/types": "2.0.0-beta.20",
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index 9c2ead275092..664fd9977dbd 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -126,6 +126,6 @@
     "react-dom": "^16.8.4 || ^17.0.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 8bd7a9494539..8dca637d064b 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -31,6 +31,6 @@
     "eslint": ">=6"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   }
 }
diff --git a/packages/lqip-loader/package.json b/packages/lqip-loader/package.json
index 5e96bac253fe..1311e978db16 100644
--- a/packages/lqip-loader/package.json
+++ b/packages/lqip-loader/package.json
@@ -24,7 +24,7 @@
     "tslib": "^2.4.0"
   },
   "engines": {
-    "node": ">=14"
+    "node": ">=16.14"
   },
   "devDependencies": {
     "@types/file-loader": "^5.0.1",
diff --git a/website/docs/installation.md b/website/docs/installation.md
index 90c16645303a..92576624eec1 100644
--- a/website/docs/installation.md
+++ b/website/docs/installation.md
@@ -20,7 +20,7 @@ Use **[docusaurus.new](https://docusaurus.new)** to test Docusaurus immediately
 
 ## Requirements {#requirements}
 
-- [Node.js](https://nodejs.org/en/download/) version 14.13 or above (which can be checked by running `node -v`). You can use [nvm](https://github.com/nvm-sh/nvm) for managing multiple Node versions on a single machine installed.
+- [Node.js](https://nodejs.org/en/download/) version 16.14 or above (which can be checked by running `node -v`). You can use [nvm](https://github.com/nvm-sh/nvm) for managing multiple Node versions on a single machine installed.
   - When installing Node.js, you are recommended to check all checkboxes related to dependencies.
 
 ## Scaffold project website {#scaffold-project-website}

From 309a7e8bd4bd46d8b6aa99a39b091df6ee3fd071 Mon Sep 17 00:00:00 2001
From: Massoud Maboudi <massoud.maboudi@gmail.com>
Date: Thu, 26 May 2022 18:38:14 +0800
Subject: [PATCH 08/16] docs: add Massoud Maboudi's portfolio to showcase
 (#7412)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: add Massoud Maboudi's portfolio to showcase

* optimize image

* Update website/src/data/users.tsx

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
Co-authored-by: Sébastien Lorber <slorber@users.noreply.github.com>
---
 website/src/data/showcase/iammassoud.png | Bin 0 -> 18166 bytes
 website/src/data/users.tsx               |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 website/src/data/showcase/iammassoud.png

diff --git a/website/src/data/showcase/iammassoud.png b/website/src/data/showcase/iammassoud.png
new file mode 100644
index 0000000000000000000000000000000000000000..e31b3126ed60886aa9fe76a0ae13e6f11084f31a
GIT binary patch
literal 18166
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

literal 0
HcmV?d00001

diff --git a/website/src/data/users.tsx b/website/src/data/users.tsx
index 88e6dffe9df8..2e78d627d001 100644
--- a/website/src/data/users.tsx
+++ b/website/src/data/users.tsx
@@ -886,6 +886,14 @@ const Users: User[] = [
     source: 'https://github.com/ggicci/httpin/tree/documentation/docs',
     tags: ['opensource'],
   },
+  {
+    title: 'I am Massoud',
+    description: 'The portfolio of Massoud Maboudi, Full Stack Developer',
+    preview: require('./showcase/iammassoud.png'),
+    website: 'https://iammassoud.ir/',
+    source: null,
+    tags: ['personal', 'rtl'],
+  },
   {
     title: 'icodex',
     description: 'Front end engineer personal website',

From e955ae472da3264db45980c0cfd6a943651cce17 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Thu, 26 May 2022 18:41:23 +0800
Subject: [PATCH 09/16] fix(theme-classic): allow nested task lists to preserve
 the indent (#7438)

* fix(theme-classic): allow nested task lists to preserve the indent

* add Ul back
---
 .../MDXComponents/{Ul.tsx => Ul/index.tsx}    |  6 ++--
 .../theme/MDXComponents/Ul/styles.module.css  | 14 ++++++++
 .../_pages tests/markdownPageTests.md         | 32 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 rename packages/docusaurus-theme-classic/src/theme/MDXComponents/{Ul.tsx => Ul/index.tsx} (78%)
 create mode 100644 packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/styles.module.css

diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/index.tsx
similarity index 78%
rename from packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx
rename to packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/index.tsx
index 080ecaac2a1a..d426298f6a8d 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/index.tsx
@@ -9,13 +9,15 @@ import React from 'react';
 import clsx from 'clsx';
 import type {Props} from '@theme/MDXComponents/Ul';
 
+import styles from './styles.module.css';
+
 function transformUlClassName(className?: string): string {
   return clsx(
     className,
     // This class is set globally by GitHub/MDX. We keep the global class, and
-    // add another Infima class to get list without styling
+    // add another class to get a task list without the default ul styling
     // See https://github.com/syntax-tree/mdast-util-to-hast/issues/28
-    className?.includes('contains-task-list') && 'clean-list',
+    className?.includes('contains-task-list') && styles.containsTaskList,
   );
 }
 
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/styles.module.css b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/styles.module.css
new file mode 100644
index 000000000000..c1d9c4f95dbd
--- /dev/null
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul/styles.module.css
@@ -0,0 +1,14 @@
+/**
+ * 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.
+ */
+
+.containsTaskList {
+  list-style: none;
+}
+
+:not(.containsTaskList > li) > .containsTaskList {
+  padding-left: 0;
+}
diff --git a/website/_dogfooding/_pages tests/markdownPageTests.md b/website/_dogfooding/_pages tests/markdownPageTests.md
index ca7e9fcff7d2..dc8695b11179 100644
--- a/website/_dogfooding/_pages tests/markdownPageTests.md	
+++ b/website/_dogfooding/_pages tests/markdownPageTests.md	
@@ -189,3 +189,35 @@ This is a fragment:
 <>Hello</>
 
 It should work :)
+
+## Task list
+
+A list:
+
+- [ ] Simple
+- [x] Tasks
+- [ ] Has simple
+- [ ] Styles
+
+Another list:
+
+- Nested
+  - [ ] Tasks
+  - [ ] Should be well-formatted
+- [ ] No matter
+- [ ] How weird
+
+Can be arbitrarily nested:
+
+- Level
+  - [ ] Task
+  - [ ] Task
+  - Another level
+    - [ ] Task
+    - [ ] Task
+    - Deeper
+      - [ ] Task
+      - [ ] Task
+    - [ ] Task
+    - [ ] Task
+- [ ] Task

From 9cf2bf11997eb6341af5fc5c7031ade849c42235 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Thu, 26 May 2022 19:05:03 +0800
Subject: [PATCH 10/16] fix(core): always treat error boundary fallback as a
 callback (#7492)

Co-authored-by: sebastienlorber <lorber.sebastien@gmail.com>
---
 .../src/index.d.ts                            | 23 +++++++++----------
 .../src/theme/Layout/index.tsx                |  4 +++-
 packages/docusaurus/src/client/App.tsx        |  4 +---
 .../src/client/exports/ErrorBoundary.tsx      | 22 +++++++++++++-----
 website/docs/docusaurus-core.md               |  8 ++++++-
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/packages/docusaurus-module-type-aliases/src/index.d.ts b/packages/docusaurus-module-type-aliases/src/index.d.ts
index 3a900c907d77..c8f2c995f012 100644
--- a/packages/docusaurus-module-type-aliases/src/index.d.ts
+++ b/packages/docusaurus-module-type-aliases/src/index.d.ts
@@ -77,14 +77,9 @@ declare module '@theme-original/*';
 declare module '@theme-init/*';
 
 declare module '@theme/Error' {
-  import type {ComponentProps} from 'react';
-  import type ErrorBoundary from '@docusaurus/ErrorBoundary';
+  import type {FallbackParams} from '@docusaurus/ErrorBoundary';
 
-  type ErrorProps = ComponentProps<
-    NonNullable<ComponentProps<typeof ErrorBoundary>['fallback']>
-  >;
-
-  export interface Props extends ErrorProps {}
+  export interface Props extends FallbackParams {}
   export default function Error(props: Props): JSX.Element;
 }
 
@@ -125,13 +120,17 @@ declare module '@docusaurus/constants' {
 }
 
 declare module '@docusaurus/ErrorBoundary' {
-  import type {ReactNode, ComponentType} from 'react';
+  import type {ReactNode} from 'react';
+
+  export type FallbackParams = {
+    readonly error: Error;
+    readonly tryAgain: () => void;
+  };
+
+  export type FallbackFunction = (params: FallbackParams) => JSX.Element;
 
   export interface Props {
-    readonly fallback?: ComponentType<{
-      readonly error: Error;
-      readonly tryAgain: () => void;
-    }>;
+    readonly fallback?: FallbackFunction;
     readonly children: ReactNode;
   }
   export default function ErrorBoundary(props: Props): JSX.Element;
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx b/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx
index c5503edcaaa2..7f58712af95c 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx
@@ -45,7 +45,9 @@ export default function Layout(props: Props): JSX.Element {
       <Navbar />
 
       <div className={clsx(ThemeClassNames.wrapper.main, wrapperClassName)}>
-        <ErrorBoundary fallback={ErrorPageContent}>{children}</ErrorBoundary>
+        <ErrorBoundary fallback={(params) => <ErrorPageContent {...params} />}>
+          {children}
+        </ErrorBoundary>
       </div>
 
       {!noFooter && <Footer />}
diff --git a/packages/docusaurus/src/client/App.tsx b/packages/docusaurus/src/client/App.tsx
index da3a1ef22f0a..8554f5b91aec 100644
--- a/packages/docusaurus/src/client/App.tsx
+++ b/packages/docusaurus/src/client/App.tsx
@@ -23,14 +23,12 @@ import SiteMetadataDefaults from './SiteMetadataDefaults';
 // TODO, quick fix for CSS insertion order
 // eslint-disable-next-line import/order
 import ErrorBoundary from '@docusaurus/ErrorBoundary';
-// eslint-disable-next-line import/order
-import Error from '@theme/Error';
 
 export default function App(): JSX.Element {
   const routeElement = renderRoutes(routes);
   const location = useLocation();
   return (
-    <ErrorBoundary fallback={Error}>
+    <ErrorBoundary>
       <DocusaurusContextProvider>
         <BrowserContextProvider>
           <Root>
diff --git a/packages/docusaurus/src/client/exports/ErrorBoundary.tsx b/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
index b8dd78fe1a78..0d188d4da44b 100644
--- a/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
+++ b/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
@@ -7,13 +7,21 @@
 
 import React, {type ReactNode} from 'react';
 import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
-import DefaultFallback from '@theme/Error';
-import type {Props} from '@docusaurus/ErrorBoundary';
+import ThemeError from '@theme/Error';
+import type {
+  FallbackFunction,
+  FallbackParams,
+  Props,
+} from '@docusaurus/ErrorBoundary';
 
 type State = {
   error: Error | null;
 };
 
+const DefaultFallback: FallbackFunction = (params) => (
+  <ThemeError {...params} />
+);
+
 export default class ErrorBoundary extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
@@ -32,10 +40,12 @@ export default class ErrorBoundary extends React.Component<Props, State> {
     const {error} = this.state;
 
     if (error) {
-      const Fallback = this.props.fallback ?? DefaultFallback;
-      return (
-        <Fallback error={error} tryAgain={() => this.setState({error: null})} />
-      );
+      const fallbackParams: FallbackParams = {
+        error,
+        tryAgain: () => this.setState({error: null}),
+      };
+      const fallback: FallbackFunction = this.props.fallback ?? DefaultFallback;
+      return fallback(fallbackParams);
     }
 
     // See https://github.com/facebook/docusaurus/issues/6337#issuecomment-1012913647
diff --git a/website/docs/docusaurus-core.md b/website/docs/docusaurus-core.md
index 782c7a3deb3a..c43d22c061e0 100644
--- a/website/docs/docusaurus-core.md
+++ b/website/docs/docusaurus-core.md
@@ -55,7 +55,13 @@ This component doesn't catch build-time errors and only protects against client-
 
 #### Props {#errorboundary-props}
 
-- `fallback`: a React component. The error boundary will render the component with two props: `error`, the error that was caught, and `tryAgain`, a function (`() => void`) callback to reset the error in the component and try rendering it again.
+- `fallback`: an optional render callback returning a JSX element. It will receive an object with 2 attributes: `error`, the error that was caught, and `tryAgain`, a function (`() => void`) callback to reset the error in the component and try rendering it again. If not present, `@theme/Error` will be rendered instead. `@theme/Error` is used for the error boundaries wrapping the site, above the layout.
+
+:::caution
+
+The `fallback` prop is a callback, and **not a React functional component**. You can't use React hooks inside this callback.
+
+:::
 
 ### `<Head/>` {#head}
 

From 06a37112bb82df6055ec0e242514ccf93bf9fdaf Mon Sep 17 00:00:00 2001
From: Forresst <forresst17@gmail.com>
Date: Thu, 26 May 2022 15:50:36 +0200
Subject: [PATCH 11/16] chore(theme-translations): complete French translations
 (#7493)

---
 .../locales/fr/plugin-ideal-image.json         | 10 +++++-----
 .../locales/fr/theme-common.json               | 18 +++++++++---------
 .../locales/fr/theme-search-algolia.json       |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/docusaurus-theme-translations/locales/fr/plugin-ideal-image.json b/packages/docusaurus-theme-translations/locales/fr/plugin-ideal-image.json
index 3576b692c08d..03a795cf23c5 100644
--- a/packages/docusaurus-theme-translations/locales/fr/plugin-ideal-image.json
+++ b/packages/docusaurus-theme-translations/locales/fr/plugin-ideal-image.json
@@ -1,7 +1,7 @@
 {
-  "theme.IdealImageMessage.404error": "404. Image not found",
-  "theme.IdealImageMessage.error": "Error. Click to reload",
-  "theme.IdealImageMessage.load": "Click to load{sizeMessage}",
-  "theme.IdealImageMessage.loading": "Loading...",
-  "theme.IdealImageMessage.offline": "Your browser is offline. Image not loaded"
+  "theme.IdealImageMessage.404error": "404. Image introuvable",
+  "theme.IdealImageMessage.error": "Erreur. Cliquez pour recharger",
+  "theme.IdealImageMessage.load": "Cliquez pour charger{sizeMessage}",
+  "theme.IdealImageMessage.loading": "Chargement ...",
+  "theme.IdealImageMessage.offline": "Votre navigateur est hors ligne. Image non chargée"
 }
diff --git a/packages/docusaurus-theme-translations/locales/fr/theme-common.json b/packages/docusaurus-theme-translations/locales/fr/theme-common.json
index 42669d35f1f9..72038899c7ec 100644
--- a/packages/docusaurus-theme-translations/locales/fr/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/fr/theme-common.json
@@ -1,11 +1,11 @@
 {
   "theme.AnnouncementBar.closeButtonAriaLabel": "Fermer",
-  "theme.BackToTopButton.buttonAriaLabel": "Revenez en haut",
+  "theme.BackToTopButton.buttonAriaLabel": "Retour au début de la page",
   "theme.CodeBlock.copied": "Copié",
   "theme.CodeBlock.copy": "Copier",
   "theme.CodeBlock.copyButtonAriaLabel": "Copier le code",
-  "theme.CodeBlock.wordWrapToggle": "Basculer le retour à la ligne",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
+  "theme.CodeBlock.wordWrapToggle": "Activer/désactiver le retour à la ligne",
+  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Plier/Déplier la catégorie '{label}' de la barre latérale",
   "theme.ErrorPageContent.title": "Cette page a planté.",
   "theme.ErrorPageContent.tryAgain": "Réessayer",
   "theme.NotFound.p1": "Nous n'avons pas trouvé ce que vous recherchez.",
@@ -22,17 +22,17 @@
   "theme.blog.post.paginator.olderPost": "Article plus ancien",
   "theme.blog.post.plurals": "Un article|{count} articles",
   "theme.blog.post.readMore": "Lire plus",
-  "theme.blog.post.readMoreLabel": "Read more about {title}",
+  "theme.blog.post.readMoreLabel": "En savoir plus sur {title}",
   "theme.blog.post.readingTime.plurals": "Une minute de lecture|{readingTime} minutes de lecture",
   "theme.blog.sidebar.navAriaLabel": "Navigation article de blog récent",
   "theme.blog.tagTitle": "{nPosts} tagués avec « {tagName} »",
-  "theme.colorToggle.ariaLabel": "Switch between dark and light mode (currently {mode})",
-  "theme.colorToggle.ariaLabel.mode.dark": "dark mode",
-  "theme.colorToggle.ariaLabel.mode.light": "light mode",
+  "theme.colorToggle.ariaLabel": "Basculer entre le mode sombre et clair (actuellement {mode})",
+  "theme.colorToggle.ariaLabel.mode.dark": "mode sombre",
+  "theme.colorToggle.ariaLabel.mode.light": "mode clair",
   "theme.common.editThisPage": "Éditer cette page",
   "theme.common.headingLinkTitle": "Lien direct vers le titre",
   "theme.common.skipToMainContent": "Aller au contenu principal",
-  "theme.docs.DocCard.categoryDescription": "{count} items",
+  "theme.docs.DocCard.categoryDescription": "{count} éléments",
   "theme.docs.breadcrumbs.home": "Page d'accueil",
   "theme.docs.breadcrumbs.navAriaLabel": "Fil d'Ariane",
   "theme.docs.paginator.navAriaLabel": "Pagination des documents",
@@ -52,7 +52,7 @@
   "theme.lastUpdated.atDate": " le {date}",
   "theme.lastUpdated.byUser": " par {user}",
   "theme.lastUpdated.lastUpdatedAtBy": "Dernière mise à jour{atDate}{byUser}",
-  "theme.navbar.mobileLanguageDropdown.label": "Languages",
+  "theme.navbar.mobileLanguageDropdown.label": "Langues",
   "theme.navbar.mobileSidebarSecondaryMenu.backButtonLabel": "← Retour au menu principal",
   "theme.navbar.mobileVersionsDropdown.label": "Versions",
   "theme.tags.tagsListLabel": "Tags :",
diff --git a/packages/docusaurus-theme-translations/locales/fr/theme-search-algolia.json b/packages/docusaurus-theme-translations/locales/fr/theme-search-algolia.json
index 03e6cefd330b..f80e0dfac117 100644
--- a/packages/docusaurus-theme-translations/locales/fr/theme-search-algolia.json
+++ b/packages/docusaurus-theme-translations/locales/fr/theme-search-algolia.json
@@ -1,6 +1,6 @@
 {
   "theme.SearchBar.label": "Chercher",
-  "theme.SearchBar.seeAll": "See all {count} results",
+  "theme.SearchBar.seeAll": "Voir les {count} résultats",
   "theme.SearchPage.algoliaLabel": "Recherche par Algolia",
   "theme.SearchPage.documentsFound.plurals": "Un document trouvé|{count} documents trouvés",
   "theme.SearchPage.emptyResultsTitle": "Rechercher dans la documentation",

From bac292d84b0371b92549892dc2b46f2bf737b46c Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Thu, 26 May 2022 21:50:50 +0800
Subject: [PATCH 12/16] docs: document MDXComponents scope (#7503)

* docs: document MDXComponents scope

* address reviews

* add info
---
 .../markdown-features-react.mdx               | 70 ++++++++++++++++++-
 website/src/components/Highlight.tsx          | 28 ++++++++
 website/src/theme/MDXComponents.tsx           | 14 ++++
 3 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 website/src/components/Highlight.tsx
 create mode 100644 website/src/theme/MDXComponents.tsx

diff --git a/website/docs/guides/markdown-features/markdown-features-react.mdx b/website/docs/guides/markdown-features/markdown-features-react.mdx
index 6422961e3c34..ca1588df16b1 100644
--- a/website/docs/guides/markdown-features/markdown-features-react.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-react.mdx
@@ -24,7 +24,11 @@ While Docusaurus parses both `.md` and `.mdx` files using MDX, some of the synta
 
 :::
 
-To define any custom component within an MDX file, you have to export it.
+Check out the [MDX docs](https://mdxjs.com/) to see what other fancy stuff you can do with MDX.
+
+### Exporting components {#exporting-components}
+
+To define any custom component within an MDX file, you have to export it: only paragraphs that start with `export` will be parsed as components instead of prose.
 
 ```jsx
 export const Highlight = ({children, color}) => (
@@ -133,7 +137,69 @@ import Highlight from '@site/src/components/Highlight';
 <Highlight color="#25c2a0">Docusaurus green</Highlight>
 ```
 
-Check out the [MDX docs](https://mdxjs.com/) to see what other fancy stuff you can do with MDX.
+:::tip
+
+If you use the same component across a lot of files, you don't need to import it everywhere—consider adding it to the global scope. [See below](#mdx-component-scope)
+
+:::
+
+### MDX component scope {#mdx-component-scope}
+
+Apart from [importing a component](#importing-components) and [exporting a component](#exporting-components), a third way to use a component in MDX is to **register it to the global scope**, which will make it automatically available in every MDX file, without any import statements.
+
+For example, given this MDX file:
+
+```md
+- a
+- list!
+
+And some <highlight>custom markup</highlight>...
+```
+
+It will be compiled to a React component containing `ul`, `li`, `p`, and `highlight` tags. Now, you can optionally provide your own implementation for any of these tags in the form of React components. (`highlight` isn't even an intrinsic element: it needs an implementation!)
+
+In Docusaurus, this MDX component scope is provided by the `@theme/MDXComponents` component. It's not a React component, _per se_, unlike most other exports under the `@theme/` alias: it is a record from tag names like `ul` and `img` to their custom implementations.
+
+If you [swizzle](../../swizzling.md) this component, you will find all tags that have been re-implemented, and you can further customize our implementation by swizzling the respective sub-component, like `@theme/MDXComponents/Head` (which is used to implement the [`<head>`](./markdown-features-head-metadata.mdx) feature).
+
+If you want to register extra tag names (like the `<highlight>` tag above), you should consider [wrapping `@theme/MDXComponents`](../../swizzling.md#wrapping), so you don't have to maintain all the existing mappings. Since the swizzle CLI doesn't allow wrapping non-component files yet, you should manually create the wrapper:
+
+```js title="src/theme/MDXComponents.js"
+import React from 'react';
+// Import the original mapper
+import MDXComponents from '@theme-original/MDXComponents';
+// highlight-next-line
+import Highlight from '@site/src/components/Highlight';
+
+export default {
+  // Re-use the default mapping
+  ...MDXComponents,
+  // Map the "highlight" tag to our <Highlight /> component!
+  // `Highlight` will receive all props that were passed to `highlight` in MDX
+  // highlight-next-line
+  highlight: Highlight,
+};
+```
+
+And now, you can freely use `<highlight>` in every page, without writing the import statement:
+
+```md
+I can conveniently use <highlight color="#25c2a0">Docusaurus green</highlight> everywhere!
+```
+
+```mdx-code-block
+<BrowserWindow>
+
+I can conveniently use <highlight color="#25c2a0">Docusaurus green</highlight> everywhere!
+
+</BrowserWindow>
+```
+
+:::info
+
+We use lower-case tag names like `highlight` to "pretend" that they are intrinsic elements, but you can use capitalized ones like `Highlight` as well.
+
+:::
 
 ### Markdown and JSX interoperability {#markdown-and-jsx-interoperability}
 
diff --git a/website/src/components/Highlight.tsx b/website/src/components/Highlight.tsx
new file mode 100644
index 000000000000..ad7e214a9f8d
--- /dev/null
+++ b/website/src/components/Highlight.tsx
@@ -0,0 +1,28 @@
+/**
+ * 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, {type ReactNode} from 'react';
+
+export default function Highlight({
+  children,
+  color,
+}: {
+  children: ReactNode;
+  color: string;
+}): JSX.Element {
+  return (
+    <span
+      style={{
+        backgroundColor: color,
+        borderRadius: '2px',
+        color: '#fff',
+        padding: '0.2rem',
+      }}>
+      {children}
+    </span>
+  );
+}
diff --git a/website/src/theme/MDXComponents.tsx b/website/src/theme/MDXComponents.tsx
new file mode 100644
index 000000000000..1005f7b2c77e
--- /dev/null
+++ b/website/src/theme/MDXComponents.tsx
@@ -0,0 +1,14 @@
+/**
+ * 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 MDXComponents from '@theme-original/MDXComponents';
+import Highlight from '@site/src/components/Highlight';
+
+export default {
+  ...MDXComponents,
+  highlight: Highlight,
+};

From cd7cf781cd8e5e391dcc45330582c4890da254b2 Mon Sep 17 00:00:00 2001
From: Junjie <90107547+junjieweb@users.noreply.github.com>
Date: Thu, 26 May 2022 21:52:15 +0800
Subject: [PATCH 13/16] docs: add Junjie to showcase (#7484)

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 website/src/data/showcase/junjie.png | Bin 0 -> 22699 bytes
 website/src/data/users.tsx           |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 website/src/data/showcase/junjie.png

diff --git a/website/src/data/showcase/junjie.png b/website/src/data/showcase/junjie.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4cd5abdfaa3afb26cb428c2c108c8f6810548c8
GIT binary patch
literal 22699
zcmb5VWlY`86F>SrxLa{4?hY+32Z!SBUYz1?JxHOryE_zjcXugHad&sS&+nhy7x%?Y
z?oB?K$<FR(cQZ4|?#yhcl7bW}5+M=*0H`w3;wk_D1pxpM7y<e}3DGA(p8pt(g^0We
z0MtYyzZ%2-*9JMONQnZKlf*{=01YU~sY!f%e7t{r%+1eVUthn!f1JEL2#p&uvU4+X
z@O0fCGI8>f(J(VGf9bf{XQX4JWMESpI;HN-p&l*L&@p6W;9%t7{&;^sdU<$#eWmWn
zX5<&99xix)dmFhurtZq39>_a;ePU$&+SAiRZ)@_f@%i-Wo|gFwhv(q)^Yh)^9V0h?
zM@J_J3W|E7gn^Rj;_{NZC9SuwZ)j+!p|Od&JepA{NNm}7b8~BKY@9YNkh(5Wee8<<
zyFRU}<?hoRO@1hYxcJ`wA#I2&ZH)Ka!v%w!tY}LR2^rOY$5QUxT3K05&&WVV$B2uM
z7n(8p_jqlv{95{_?Bhd;*3a(b<mCGG{WGsVE}OcWr&nHn0lk`XXn4f<(>aBVFD4PO
ze?Y(pJKMP;E1!_a-QwKz^fYyQhTy1vbxke3zLtoj4E0ReS1vAPHFZuI14}ELyMI`{
zP>izjin|iTYf#K5<rNeTy+ibLEp2TMj!thkmp=bq<2GK$1qBxFKDtle2WS2nnV1lY
z?=ZUb&#m7Qf$dPZSicGgaExd??H&6BUcWv}FPIn$bm+WZ7mo38mma=Ts~l2}zRGg+
zao72*CpCSc0<q|W#lOPtoZVgIBu&|7p7;NyUZ`B~FXL>DsT@7}IQ@KSO!diB>FSsD
z_2M?G$yxp03U82XX6^od#o*%co*-mYgtq&${`6yabzFW+P}vrm0=Qv+6p~ydQ#^Ed
zDm!MFAQGN0P^D%0GwXRuuwrb2J5$*t^KVH*uUlfo$A`9$lgg!)HYr$H`Mb-hjRdQe
zmx5(v+C*o0=cBeF0~WielP$iHXRvXB=CDRoM175l`&q~2y=$H2;E>Q4kEmncC|=f)
z;)5D3@X(5|VObfs(yT>mU3q2--E0fdmbzQ=p7z+;tX$-z$8rR^Z3lb#uBo@>0*R#A
zrh&KBUz1s{*zK(FV5;$Jo!eCxy}m?na;@*0&K(z@>v&;LO8`Tp=>0)Lcgy+OcCnS(
zM2!FH>~tJ0XY%ul5B*AAIPf(K0LTCtaS=6-l~e7WvK1XdVQUqd@bST1M@;fhl1e@T
z%6P3viWpw(@_|NRcC}_{37U(5vPXO!{kz28OD_F?UEma3Bu)JFHUb7%yle1qZMbGI
zJ^Hx`9MZ4U*|m(6lnf6=r?U>cQ8qt=!sjvfxQ&OmN%u}?B>XAq)I9pB!!Kgz;WKm^
zw94h5qu4<aal9}la|le4Xau2%2$D!3CX)Vu+n^I=%~ZisLw+W@UvGW2VwtTZ$K0wg
zzG-w+IUtzb(}RDV4#Yl8%;LtwZ#=0;5Am5V&8!K~GI@Sq^ev$1uitF_O0wfSnI&`o
z$$$pP1mQ<{{H&<VMULIHY(tn?;@e7HvtrkChenPL=e&$_S&F%W_%zW6q@6;%#I?SE
zVIpv)Whyb``>ij9`Gw^q3dn`&L4!Y#JkQbcJFoVi;}BsQ7Fp{_A@LJxO?N|Ik*`R1
zBNkRD3cx1_<Aoi&QkNES1@LyTEh89b_;z#nunOsMP?3w5=FWt1NO4zYiq2>mGrAp!
zP0?i;?xw3@O2m-7LnP49kqJKI#`XV#4bfM`?EJ$!;Kz@zFTK0T2r?2`-#hnE{=#*(
z+8dtS0Bsz8hg%kMnSc4(Xw^M#ImIk~l|pca%ULxYn{nxr&mI`wrPkE9Z11cRscBrz
z!*33&U#L;knk%pCqQ6OePHcgV!+lnk8mY>Ff($=Dw$z!??u(@(SZBUZRfJz00D|B9
z77PvvDOB*hwItNsd8-yL%oGd0?Q^oKjrTLR(tGRbr0^LKoBUQ&PIpxlI8&ilNT7%f
znaJ$NJ#o;6Uu5&C8Jx7VppJiFF}D&%#V(qDDkF81Y~$^nw0zJ$9v^bn^-qnxy3vza
z6`oRSvn|E5k=0=+CJ<A84u7v^kxjCmRr7Ld)T*HGs~*FLH(SNw$rTFhHks%8duyAN
zgd>K*TnV~ih#y6Xf;XP`YONP9<M(_!Zp#%xs@au|LJZn-vTo9%bLD2zoPQ)4M@4o!
z>NDn6fvIhe)yvoCT9Kd3bx$ifF4TY$zv^@UF}w}2((irpq$`^CtRoqkI-!B8bK}g9
zrTA^tdUQ!}W^yr^+c5<Op`A~NxU(=9^*#M^t?}}yF<??ysana`1bZzJTkBg@R^+mD
z>Fd{%>ipeelu+_Y<2sC-XiSltoV(xN63uJ~DPlmI$nJ_%Tzpn#EV9X;SNm&ux1>{n
z8}2RKvEa4g;^)OrYLg$TQmlk%P;?$&W%%dH(%Rjoopds0M8P=OZIsc~_}8Xn7zTF!
zA`7G4!WLFWL$c97LXC~BkmRp8^Q}R+HiTWU5{x~2f)Q<UTNYnB$sh2rPb1b_J3^pd
z5g0e8@#RelXPP?%h@zM#aE+X<9JF88JV4*ZMy0c(@C1Jpu>>zn>*#c)PV&~e+FH)4
z5Z@QA%&CPeSQb?-{H*`1J5;rz;VE#;lDKqhb|9)tGBsDcFwpeZbGBV8Y(x5F^10tf
zFxu>2ObdD-Bh34XyJtAA!49T6d?~z`WbiLoO$57ggfM@oxwXMGrurP5O{~+R%$}-^
zxkMW+>6N3HLcw~|yAv!s$-l{~gog9RoP?>VkLH<v*N8}$yhGo=nDT8w8f~reJ?(k)
z1nsI=amSAI_*3a3cP3?O*3#XxD%EV76)LkPrB3EW_Xc;2Eta2GeE2hvMQ3Lhq9sZU
zT)*nbj?^?J;D%jm{2l-FiJ{54yu#S(*M(dy&+LA+mjZS)pZqVby2s~eY|hjB30WAw
zm*9;)vN3Ge@UTmP33j~zc)J(9E!hDqQuth2^kKPBoefc)WDGxJ$Cf`fH(37ZGX}Ky
zTsD;Ew{41-uz&3kf^%*|%*(k-|I*m5m`@u?Nu@)L5Zq6S2%Ql{Sf|ZJ@TE_T&j+ZC
z(dM`Ihzvc#*h$TDei~eI(^syiAIgOvp>q^t=fFsBN=CM{c@aCkqbglwq)$fIueQO*
znQ7pi>393OwaRVS=K3!expAkZg<>wTkRh@NS?yY2>L3@uJaT&UT~c5DJ8Tju9OH-`
zong+_Q^XHBt7j3_(*0DUh?tIgdk>?%d^&4nIz&&PUHB@d@iP5uhv%iD8}xnNQHA~y
z-Nv|kV>5pRp6egY_oE5_@W{T*+KHY{pmQ!VV=X$BJfm0GqG1J>uPb#RYrJ)C<gMf-
zE{CFxE1eI|iO%sP4C0?_rA^)h#dIw}2VUX+X6_bc_|P{C^-1n5D<#b2J4PAu__=3V
zbgr1B3B#NA?Z3b-x?`%a(mxC#s!O?9k{{^MMVUAK*qBN3E6Ncqch%F2<Iku#TZn9t
zX&E9FpSxkOO(@vNk&wZzG*Dxw;UnIr*XvquUdAJ*@+2m^6MffarDNR6L9}4p2DR=b
zgi|}ZLAaW?5EQbeYr2<>3+KW1@Ym10`)2~9A4vD9VSp~^^Qn<x_wPUe-3?>22My}h
zkC%^+FKExmP!7`g8f8nlB<6zVrs`Q(yPOlX#K>sGkR0wi$Q&h9Z1UOq<RiHd;lsHL
z$peO?>-~Dlko$hH1tJk_>K;PzyP^`|F~AV<g*M4ZJD^%P@SziV;`0obw_b1OsF3wC
z0j}M`Sq+z_2(|%imu=H~R6h6UKIfzOy%=xze)`LR9}~pa??Gob{y(=J9|-bAbc|Ur
z7z_}tTP-D1kA|(l77<5agPrXBnA+&vSfcEy&`PKJu@-Pnru5DwN)CQpA)%{)k;I6S
ztNL@oRP%!WPGWNC%M~4OB8Z!Of$dZmIj)L;$(26gMef|-F}<b!Y_tA>q%##Rh@xE!
zCxOe{P5QI_X4BAqJ)>i68ESkWw8Fk_*47_vBmG^tBjnzq8+WwS3HjEh!mlvVX5o2H
zr$WmHEe%Kb%Dw02=AjhdGT~;geZ9n7gmL4~p6t9xCuDesWmxFt1X*c#5pF_-+TiTV
zbAxzk+?1wlYvsX{Bq@X^`-j?&SIfp|^0QgTUds^VdN+i2RDXKfQ^*i%9*PbJTsVH?
z6@WkI^u&}$=uxaOnUyf_*F^~Ln>mHYo$W=Mpw&1`p=>>`llToy;m8L^%_hAR4h<^8
z;HSt_=lz}i1@(nH$wZA2nLh)atYv5~!evjO6#691m85{pOMl3+e1S0tgE5nk4kqK%
zhmf%FN1xR6g-g0h@d~kvc+L0&pGs3IqlR@w?fFS2?8S%Qy8xWEXN^7+-X8(hDEL;o
z;~kMnMH=L+H?!;QfmlB*ygLQ4)81S{uO^1O?JFO}?I-chl#9l2C62<l;qbWibE?L3
zrJusDh%5A#NiT1HP2{c+y00$EQxDc}jXW6q!x2Vxc~pX?#xQ(>od^Y$bayH$rE{AD
zlA5%wnS=K_P;*EvI$bHy@-o}})W9!fq~*Y2igf<Vmyi}cE>KjL^$#j3h-iC!!uD5}
zV-pyUgUL*(E}zHCEmA}W7}%0K?^3t?wFPUHeBDoqR2yqJn@>_onCV`>s_t(-%nnct
zRtK+n-kHK1F7cV&Z1dH6MYxz66Xi_CB6efSnc?ds37Oj);L8t<QcCivRN;D2JiILF
z$Bku^Ig&e=GR;^!PR;CEPT7Bo5qw)Vv-nSzplz8dW{m#g9cMabmA0w0QhU>BMY1~U
z{VenR_~O^~@Gpv8!)2hBSpR0M^`L|kxH){^_;8Ash%kjN|GIJO6M?;YtuEl)EztU8
zbV>VWu1&%qq!DBGRM{ou<cn;YgR0wHl-8<VWi;iK;yBS*9TrJI*JSq-R=6ql*hs=v
zV2X8zk8m~Y*mVAiU|cSmDwj3ulP^4G8vbV{WPUpW{^sAliVxId5mLlToD(5k(UcJ+
zaNc2OgF}sFlzgfVJ%DZHIz$Q-so|?egEzxzBO938V9-w7{qtkzk$Wf_5wah-jm0;M
zK2H6!)UEGhi7&--7zI4#%7oAEYe=xt>aS1aJ$%hnXD;r>HBb6e4Nkg>AD4xr(*oK^
zV)Y8gl`r_)Vb8<Q&X-FN)*vM?xM(|8Yb!r6T_?QoLst3gX-ju(Rm%8Mm2OnkA56d)
zpb?cAs*J=QB#oAeDiUEaVqCft`HLPD)amVX{WLNn(}|Les0J!?VQR{2#!vHlUn1S=
zDc|rvVn_eLm+G{^xmuF^x+=Mpt!PoQFJ)wZC#z;|ysOus#Fn;#_L;&$jkH$z6F+))
zwxIX@;mnok@I%BF$<5Ao@w4(P+IzWQ!RIAwf{s(jI6|<>h8i>c@9E6k3Y}mb*1TGl
z2_eid)Y%v*pxjD}fU{Z8MSV?!g2nS;<c9Tgg6S|JebV{dAlf}nd34T3-Zmxx&z0{r
z+G^;+47XwuERO96o?bK*X#{0isduyYtcO(^664}XsZVIDAOS+co_^Q6R4(9x7T{$#
zaH-pNY_nZDm5+D?G|?mV(Gg8NUzb^<dsWkBSBl*oPCWg1sR{QQho)h(^(%n=angc2
zrDgX?4-kGjL5~Kyy{V$xO(_-|zLssX$-3IGeSVI;7u*v51W)W8Wq#7R6H#M||L1Jk
zak2JziLWC>P~$oMY^5>8Wzkh{v3~&}Sin1It%kpWjsE`ZBFjhd*xenWecNQlzrOZ7
z@C3Bkh&r;@?J8-y>a?9$Yw;vDr2fO43%j<79QO5@5(dqdt<j>i5-EeO$bvFwUYqn!
z@e3S~1q4_|oRJSkm=U1?mTD1sg?+<S&Fd&&)9Owkh{*`i@`-DpBl|U(1JdR%+-4UC
zh;pRin;OD-mH2VA34x(f(5=$b6>UFA_;GVNf2X*Yc=}%X)piU1*V+1dM~Am1+w@m?
zV`T|38W;6@Ym`~4B8_aWqXD~4vibe+_3ps9SzW0_9uDiku;Rs&zr<|O_xI;QL4oSq
zSFOeAD?oWEPf6XK|M#>aV|)YcFwK}DOQ-+=hmP?>uOAqtH-)-Q_K2R}!TR}}BI{dL
zN@Ha-1&(}kM^~xP=WqUpy5B9~UT1Qcq$11{lnW7<M_czNo+Zqn!w40B>v1bOqUs<R
zX25)obSWtJ(?Smoq>>XeMB5%O3&%iw<II45y|d3IA^nggOQa}>6-~w23?pL8L+<ri
zpSbr5V9Q*OFL1z$%#=@&C_=emB4^q?bs2mt9I5{sI`HHvMbGiZnHpd^m70jsxUbE{
zm5MJ_?r{D*#YjWEyc|(XmATd*tjZdIp%C8Zn*XXVnd8<c^^Ezc<NYxrJd+^6wAVDR
zSdnz2>tj3FB586m-E*Q&r79UcnK{TPG~i#WR&xqlm-Gzs0{(T+^U!w|f@brBWDc(<
zAA>Xxf@MIL${$sOl!lQ)gxL6#h>59%rYHhK4ch`hL9f+m3`?Jp7<DS!NsI_TmfcGY
zD_?Xg<9s4?Fd^_a^>EDGWT_k8e4V`J#>VEby<sy2!*t{~L3pP2?%Rj1KN7C!wPr`F
zi^RDTI<^6!9Loy_6oC@#b(2(AlEfXKz~$`I@l96@Vg93X2d4NDcV6i_DnQNfhnw}e
zYP)0|6J9Sb&x;7^9SYdU&-1!@e)6^!gkh7BxWlE&hDyo#Pc-@#03|H}D#!z7ZAAVL
zS5a05O6eeKYS>@~Br+Tv*qE^YM*P2aJ)&h(4mpN5ZCB16&k8vwv}6-QoEQ@0@a$kC
zRq$#O^fIQ(U`0VbZ{l(d)q#3FuC=<68m8F?6!6hOj{6-}zvs=%8sZZS34D?cRKu4E
zhAza&bhV>Y9yCC^wQbDJE&geXyRhfv$;0M&!Ul00LVCRaw&S;YWF0Qiw!&oZwvM<i
zy9-+{%d@xlfqz=MtL3Ate~IBX{vFviJYhE}k?CR#yWu0uuR>#-2hxQxUQ)6&;Whu_
z$UZzb-1Au7cD=#|`~8&HTP+!F$<SL1Dn?~lf*wAciY3=1I!YXrMU%Ef3&0zY+kaN@
z#^i?v$YXwF@olccIT$iw4>MzPh68k(FQ_%thOpgo<eVTjTEkU2yxBD-c*zVF>?Gth
z?4c|E)RUvN({^aP$_!|uX#zwcN*26X8=^H>1Q>uE18I|g6JjD_YnS-@4+oxFdVE;?
zYn)=4qDuSzrien!V#Ys(aFY{T!W7CX+6J>}RhC2JG|tgbYiuySUHavpe%komvs<TX
zf1C31ZijSA!Qm}T8h|D)c3l)+kMTFZZsA$x2_&Z((=WjM%zS{8Td-KXnHh=9icIQZ
zoZ4Jpj&Pz<raCbn=#&IF-yX=r4?KBk`%J&>2VTdFiE1RuUFB9347)8s*$-dB8LnyJ
zrV9us!#Qy%jx#Nhi+BZTIB|@H93&xdb&|reZL<8`;w8h3@F2*dQ9V038dr!x>7Buv
zM&t%nBMHW?J2?a9->4qlJ|XCxU}Q;SkFX&*@huy<W666cI3<b`z{XG>;AdE}c;#JF
zmF`NTRP%bcwtkfW`D6lawd&WTf#COzBbR%#68LWaN4u_h%X+@G@{Apom+Hc?A5DZ6
ze(Fi9nF{0`waZ5d6t2k06-jB4lFn^N58qfs0<GJiQNM{Kl8@<rH*KrOb?iPpALU@5
zRr5AAgU+bxf#n6IPzYGX?_AjW^Zo*gTKT6%WRhBVfu=ePuP}`ET96rbatEApuOA|B
z12TI80*}a-Gc}erS*QTj?INHTK7Z9d?$g>tz*H<3zkX_lC9O0AFK+|-(2u*V`R|Mc
zr2Lvq-Fg(U`9KyZ27RA%bDuP9<CZ_fWJ~AUc`>Jmb@OcUmc~ODCc5l|*zhBI`iQOO
zc)?#QkM*=deZ9t2h-knZ)(^JPePf!A27)h#flb5n`-B39tCsK49VZWt*dx8%p&|&5
zP&l(7#&6X1vxum_yK7;3LtrU%dC4i4B5;pS-+#|jNAVxG7b0^XcmEuQBdXv^kEHFq
z5WK89f7+AxQL&G-Ak<T@`ZIoT(Q%<3sgnf^&zYkWQICQ(NThA^5!4WnQEiBc8yE1y
z(qPrU*Zta`g;ivN+YUlTmmI_JWuM5qW|q78ysoGD9zz8#KF-m=8j1zZP{3lG(a05v
z0WwT3YybH1t-w@Bm)u{_OEPA{idO_2k#>$B7bRxqw(jr%R-nWL8yZN+ZK@BXx~<^5
zYBvJg?yW5b_?o3qr_%PZh0bbxOUFpb01$8)p{6RGntQ)3{*Ddq87Y8KZ!98DqYCPn
zj?Hq1%3&d-MUf;w?k-)0<b*~cJh-r%{3fsZ{(I|dua!B!!+(#b65>hV_f{FCa$+Ig
zEk)BUW%m>FJ<Pt51K-$boD!}lxu69$Ctx}=f!xp$gi8pUn@nvC$0!1lROjVmz8Oz4
zE^BrRy_lN^T<EVV27;~ni)33r!uNiFrt3nW%(Rf%q3k)z+i1?O-0**J%|PI1(#K_M
zZ*;xJBln{BjK=nO?uV!v6)@rpIb@4?U_Hr0W-pLOnh&Ab)OPLDkb!MaXt+!q*1}Jv
zq5<JYwT*hO)pZ)Bgg2J3z~M;wt*$6GV}d4t{Z)6C;nK2d{A;~>cCQ!I$$yIGI-|Z#
zs(M9o`7;H4!Gu}bO2cKa%B67nFLrP@CWo~kk$|EQxk;5joM01Jet!I@1E+>QMRfMG
z{O=;7cp%U$Yzj}c4F|>^7OWd!7iR}&l&VuSA0r^2XfmUOEE3%+qrTERqmIGoXkLfl
zxZ`1>_z3=ufDnK^)r1*#_u~&HT#0axX(j{tpUrXDot|yS1C5hq0~^eT86pvSn4WyO
zi7%f8w&?*jI#mh0eye920Bbld3LNYxZjH-Tj{}2B9gY&CQD`i`zS*~rfZcEe1I{x_
zOW6+P=ofXtY#tJKRxQKu)j6Ewb;JDoFo5Rm175V)d?-73bE`2dzi*qr=}Z1b6i&o@
zqzj6<hG12q0WeZzqVA{^WQGL9x|oLL+Wh^5V<5{2R6xrL?(lo4$}anXv-Ri!SWYd$
zs7IB{G#&%w+KPg4((|ELVBC$I;lfS{Pl2bNbr6jP|LbezVgk{qG|}G@iSnayGZ8Ca
zC<tfVWz?x9?k|!rMKUR?T3<qbH>=~8(A&g3^FYU>;O-CvuV55&_Je)c&qbbO2QY#=
zu;v79X%ci6&js4{|JrrwGBvt~pKYU64cyC`)p%daKb!$<C~1vS%a#S;ty+{(48_!q
zCx-n9B8Pl5;1&^r)E)u|%A9j%>v;HlTAG~2NWcSai;n>r<=x74Q-YwF-(z*$@)&cy
zFl{uZ$<j-(83L>1HaYu)d{lX^Wjp;_Ho$B@f(Fb#u`WHwAR_;PGh0fZ>m9W{>C^;x
zfTMms!zP0#YQOj|l3A|KY8D@?0~Yhk?cwnozu2j!?(@Xd>$Vg3M!VNc_L+543nG*~
zji?Hej9j2987(llq6sQ_wW4j=!gbSd7-1;cw1**cz$o9Mkd1oD;6t~Bg8|!fXawE;
zH*Cmi#0r1#Mj$+w-Kq>WLLC+x+X&5#XO(ym4{$LA#Sp{-Jimsu)O!GzO1K=Gu;Me2
zry=X=+1i>L-bOF-1`E2SQm~;gprlHRCnsW9DTLUqcf?0xoyS3LLt^i<F=Y4#3!rC3
z`5y8D^cPHJB5^<Aj(2Ng66B1Rr|Z6MM5FVQ^I<X;^oHYO+{o+Bq99Q4smwbIXCrE`
zkdx)qBW^eyO?`?$x5AG?Ez$~9iCgG*bY#-1)ncYtr4e#_<^)_OLJlaea(zIa;_=~c
zXbN6;F5!WEO=Hl<Ly^XCId<}xi5Li-A>St`cBz3L^rX!RdWL{lYms$rgrhZC0O{NB
z?yOY1+8Y6~Cxzh!^6#aPp>Wx6v{T1CIMtH8-!ytCTOTmwQh$~PsA7=VEcI%(2k<o%
z`L$Dcm;9jM)hA<Wc$xbm!SKZ$E~n(vXG<MRiwTN;ERDV`1Yc()I=oM!-}f(UKqcYD
z^C(?s)(y|Zc<U8H@6BR+YcC-<?U(X&mmlzudWkJh{S8W^<mLUZ&>U2)ooW`+PIPIv
zZ;fU1$Z$c;L4m;?jszLS#`PnmD*_BMCh1DH$JqWdQ|CHA|8m<*LVIz9uav}ysTl5p
z%={6^oO2j^4W?f=!)(U$s*a?S!;(d`JZ#qqN$Od+-_6IpZ(@S23M2iWJH^W38R~gv
z;vRg(Jn8<qk6<uKl{1XC+$%O4P57)RV5|zh-d?u1z7PXHSCreLr-)hCDUjO#vl(6(
zT3|a^QS>NJ_EIi4S}e$dqDWQE={w-%R_MH7e_7z1^c%MV{=w2h+rtpCAHwmyX=SCF
z^-DfQqzSwN=I3Zrl0lR{rKt9^2JvE}32b8O&3d-6_MxaeF(Mo^lpuvIQna(n<;oam
zX$&M;K9qd1;r#3nZ2>N9VjX=p51(x~9?Ns`qY&E|L{Ln$sq$$U+U))>9d_txSt{If
z5meJ2S%{wb@}>t2*rjy^)`lG#1HoHyZ^r@y;jBkktBMKN9u~4^+8zBZ9UWe1;qL+C
zLSMa@dPKeRN-hDXk;hNN!!V9IjNoKl$2TlN%f&w+plpbW47h(lJEiQ`p<zp!`+j(e
zDY_T*F!=_y!-@L9L`o79&=<!ibyvXf2XRKMz<%%KA!*I?<+R@7@o&;2GWj-?Fz~O+
z6x`VCvm0ny$zjbqZ&qLGABw?#4G#HL8;{DDRdy<eq~beFabAD>btTNZJq<K3?zOsx
zE_`}%FWmWa-7g&1lL&B`rwPmRL*jPnw6X}O;Zn{#a3xS2N>HxzKmIyON2srXuAjxd
zvy3UK-%suJMc=;roG0@_)I;)qMkp$+ogS8`mB&MxdFV*%i+a*un!xZYA}!q}HL+A4
z=OBMNp+JGAVvfeNui47e%-Q>E<u6a20+l1`d1pp-MTsdP4Xvv1ObG<>;?h<|KlB-k
zMCPO!&%PN>kOq31;VKE9nM1)mRooNr_^u$UK27PZ!vW+oOpG|^PZK>oTasi+2k<9h
z*v|oJGc6S@gbl3GrdxtN@Y&5IZvw=jd8#TUv+^7+S1=WUGLekTuEg2*g+=7ep=8L%
z<ri~VNH75}Cb-+*-|K1E<)<@}xGN5Qa_h#Wm%DwiW^snpTmBt=^E|c=&|?E#KGAVZ
zj)EKuqJO^K^@VKw7f^~e^m}^R_{qHv1$@n%G$x^S@Z%iQeW)eKT;(h4%;@s-x>-86
zbP_uA66(+OH_o6j)r<Pcb$kN4d*YVUZ<qg&IG?sZ|MN5N{0rv8my^KB$f=Mt+Uw)L
z&*pId6o0pQ@BegfLtfDJNdX>i?7Q9`3^zV*NH=^Rn%pne-=aHiyse1!cOKhJtwga1
z2a5t%X0Oj3MALh&G(%hG^79kI1kYw?!Y#YOj%A5hhx5C&nwdmZZ+Pv(WFF)Z-fc|l
z<9bYV$e(e8dr0u$f}J^04m{&;LpbE;9d)L-qF287rhnne_RBu-+-UL?7@oR^gH-BA
zh1w?{G&=UUO(*|otr*#Oinhe`6xd*9p{Q?uw4B)yu{1IwtJm7r2fVSmb$46N^s1+5
zs;6CSPBxB&LEKZ1JYkYE&0L{y({WiMpXV&pyz@w>8_IxnhN&OL5N0W1gZEH40clQv
z@5|OyqK1;8m7YHiv#O)M11l7Qr``6TryW1PZQ?x^FvBS(RuZ>PCoI;21obTWjWV8^
z8}3xTO+9OM64u$f!t322OKK)w9UJw|>KQI9PfjLq74LoaVK@@xtp;r$d(i0I(+1Dn
zmX7>W6wPEgUy5$`2w4O!ASnrhp#{lf{#4cZz~b=2?h$M!2wQYHWZxD0Ife8CGtjcy
zd?PpJoMChRA$Ct2bJ|op$sMsh6bg-`@v~2zq)_{M`8>S*Gt9?Z_DHEZb0*%A0q9aE
zd9b&hFOe}Uq9mg0^5$H^*ACeHXZ(`8p(T(-_<z>|tdQy5-`+7wl;WG^BilP^0tJqD
zBZGrlZBs;je=t5r8*50Be_8&ec<@of+p-DwlPuuiph|6m?bT~!8a4mF`(qg+!a&#=
zAXkxxpH^P<1^Y&PtnyQ5I#vI5@AsnPqo)(iw7e5=cAgDRMFD%WCg2l1{TmvxV98_%
zrJ(-#fRrquOmKPNk`LfOW6yagd^p|S-Zqu|>yi&MtLbkhq4`CE+3nwii!$hCv+GBe
zaQ7T8N?=Wk<c&mre|+%?4&(O%f)zXGvqo(P@|W{%)|{zn#`kZ(q_b6KBO>w$BqT08
zq~zQ|-#v!yM?%oz1(G@b>L=}M7me2Kzoh6Wig21QF3Q8BOdXV=jJ0wsDS#f_bgtc>
zzo|=)7boMWKBGveq7GCY{+FG8T!&Ip<8n@?&cX~YYmvuMbus5`8cm>~q2<QLbhr_#
z>kS_ut`7qZe;X}Br%4{fKBb|Ww3tsrUxMmh9D=`eKJ-;*fBh3neyPs!tyP8Pg_8sw
zstt+EoR(|?cKKjT89fbZmj+Wu*>o7%%04(z3pUNUT#N8B$MJHpTr_Rdz5E#KupAPi
zz``Tj$v``{+{B;^mQW6*VyITDZ^}&SW`S<jhGxTs?WZ$GMC~`B!@Wky(bE2oIvk)0
z>bAs=3`HsT5~#VNUNZlChGV-EK;nb}{tKhzr$2ieQKUhJtUMoKM;Gk&uMAj0LICn`
z5Q0rFn+Ma7ETN>aF%CpXUl=G7#gwC0S<g-bd=+54m|+v9aMZb9V_warrE=mFJ{;Gt
zSZUVyfqZH0p_8&|xw=<sK%Tha=hev*o#QkMBns*9ANmiFNBK!w(b2n)#Eg*dv(GIH
zBdMF0!f^+5%&nqq<E=i(;nOZV>P5=Rfk^s)bM~>JagmasMEPvN`^qyy?+-UK&eiU<
z?X<T75K4*P_nk0g!f=2N7sQ|$;A=ISBu9RC@N;nR>x}m;!yXGZe|^1qdFaZ*0HQlc
z4yuR%4#0>V?#M3j84Kcz1_TRGG8RcV|F;f{N0XWG=2+c9w)*_EY-{ZM<Kn>^chT7=
z;Ad>XB&qcfs9%7x&;_Fg{);J;Wwm-;ejy3u6vnpTAiQXAE$?TPz0*l-Oz-jyWkb2S
zkpBjC)Wa|blu_!1KPz?U6V}u|_c)qR=-2p2SHDa-Z!2Un&)H+Xu{!!BO#NYEoa#Ft
zuu}IywovA)-?evq$4^rRBXmIeW-qoBZ%T=7w-kWvo*>jj2!Dcgw1LmjI)x@}Kb}gy
z3#~u#&ji^Dl44+EobHCD0!d!b-9o!p;_zUA;5V$4(w86s%YqrqA2j3|=q@DPDf5^W
zdDB4HeUA>y9@L>_h5n`Nr|$gl@ch=7ik3}7FQaclfF)XSE-}5ZcmbM&csvpn^}Ujw
zKFAprsL16>)2#ThX4ic$GwdG-b)K!CVOHmGv%ed8XG6bPGxrqsEmKjH>TYE2!AjW1
z;5x+kt)=wJC2Qu(d^dJQNt(()gqFtFdBxyu1c=&a9ak0iNanIns;Zw-!^X6T0Np8g
zri@Ph3G<HH_MOD&jm2@8%e5`l<BJW{Ky7JCt@ZabqEw@ST8hMPg~KpRxVS-IFc+Tw
z5KxFV)2>wPE;A_>IkZIZ-b3+C!Pmd!n(@AD#lgb?2L+$;5sg#!kyW&l)AI03*~t@Y
zI~l^4=RR?8z^^aZ{m@GvEgbJ@27@gHNvnl0EXbSf(-Cttg$_drW)`u&(Il@2S=tvK
zPPVrir*wp8?n5sWQ)t1wTQ7$SV$(kKe-AprY=+^rM<}&xb*%d|I)UTno6)D`5D$#j
zreZBd$Vp=8!Ipy_fm_xzNAC>#lApbmr)$Wko>kP4>!W2e0NJ||YK2CF!>Z!6h=?1`
zL6POV`#oAEe2$)_ThH{a8DBcW#*VCWH9gm!0)NLZsJK?$>#sOULN>c(<|u~@n|rp)
z)W^8&n~64gd;<_X`OhAtxAw^=w^!@BzzH7X2hB@oxITR67N#Gnf5;D(G3Dg$zo&)7
zyC_Z=hTX8!lOjA(eH*`p%GUXO;k|oOiY`bX&iu=wJ)WX|3(vky8~q!wFhOF?v_QYB
zji;Bd?$xr#Hc^5-)qoh4%EI*t%eQaHLTPIA1-?8E9|!_5B-W}HCs-bdU3Lj5=c1)7
z#y=MRJo5ANuN{9Hdi-oJ)o9^!yVk{*nex6>oGodQeBfhPLu%+GB!tu!%KGnaKJy{~
zY;|EYG$ZX>@VD+QSl?%fcgfVNP~)E)8-7H$qC@rkvgzpx>}}>va>T=f)Mp_dd;+wo
ze?pu4NtAt<Ds^nN9eZu=lwUzi4iUGooU(+PKgJHqQ1hunKb3r@*XqDQ386Hv5uyds
zj}tZupMwLpdi+%I*j^nxo|0Iy?k7;tg9CeJW~8e>K0`^vLV=LP3dD@PjX%<8;KXg;
ze@7}IoQo>VM;hhH-US5yMXcM+4x%qh!=+DKxE-21(VVY^Rr$w&!B(anyRAv}Tuk)D
zp|1N&g0jofj%~4}WyXjHD@&2ed>f`8h91|lXmui8Ir+i8AyLlb!+(y;Fg;yXC`uQY
zod^*(Y%%=^UqGbcFFroo{ROpw)Jvq@B*duCpw;oJR&9gas{)A;0*h$?vP$&iO7Kb;
z__pTA=FHG254?5wxnRyaihycNDb5USxR_vA+bzya#1U?~P@4p9D(aBF*cmF@i})gt
zgvvZ|dWf-|`G_MV0Dky=m~hc@Ad+vuCRSt#7Y**7GstELY)z6jg_-t;#%ZAy0|O>*
zKHjt!OTeTf20U+2V)4S<rp}&8$&M&yY~|_aCn?R+zk@6zq7}Gzn}ksf!ZtVGxq2!9
zzE@66P0<!UEyEI`Q}1tWE$@*#wL&i?>(P`UJCo6L@;d!A4ySB@{K`$WvP@A}vcQM=
zPbX~6cWQb58@V&m_*58uQFseH9=Xd;ymhv0`;EB6=f;uy(l%J}3wz{xtdJJ--Z7b?
zb8QLj3bAj`!(#%$roSw9c(rJFMqlw-DvlnLx)D@NKv}$R_-YtC{q=96ERal1Fa-o^
z8vFBlmM;pquY(6$Dgv4m#oJqf0bl91Kwb43=@Y5<K^;+P)WDV*dC(z554rmLm}o1q
zq$E=e1p)$GKShUiD9KoC%r~a<PkZc@bM|cZY!{qerX_z0_}5xFzkb_y^C@sqM|tEq
zi@q7+(mFmAe<>EeYM^)3YEdY=`y*D#C>|qKSoB||Y&%Wom^Egw&W!`a#?-m6Ww7Od
zxw5GucNJA?@xuRclYDJov5kT~karI)cNtn&Zw`%-gJvxY&jxB2fh?KCc5$Y87y5^+
zyvPqW&&@i$J_i_E)8XuID=#`#61{~ADcrdG;`&?b;j$|Iu0lVJpf;G{1m<Iu$up4h
z^hPr%|5U+DnSlrQEbnWkToZ19Uo{kN;v#|vIl?!MOa;@-XW!OTg)sI^<nhb;!2A2t
zL4H-D<l(i6nm~xsq4{d!#I9(2p^GlQgbJZV6a}|_f+tzvOn!deEHac->ve6FW2r=c
za_MScpm8KrCzC*4|DYK(3!xxD2SYj?BMPUEvyD3<xeJbC<vpj|YgC#`lI^}Z-|^ad
z0I`M1;kMs*QYa3uvY(ea@D6-!FUSytVnGUFuN+b38doeCyYV|-tCusOf;}|j^)ga`
z>G?9aqxLe4`u*!{uH{kfCr__x?uFwF0kZSJMb`&VYB!9NxR+Mc6=EnXzG;Jj2RfxD
z?4Zy#U3P0_LHb}DumrLL#V@-Hy}lzBu*xicwd60k%Ms=P^7c`|m&;szp$%KT;i`-C
zf)R|^^6>TsLFc~6o2yWk!PC2FMi`O5=aHe9`M+1IT=qn?o8_jA9?F&?bc4qU6kJqS
zKx<OO!A!qWw&nNf_tTp(F|(2fAT%Sx(`X5edT|)@c_r(7t5=fsc`H7?j<@LhuPR%_
z+H7jGK_WQm`Gr+J;?cFu?Lu?LWLRAM)5rs^)Czw%3v221dPjc3f@_0@eH;{rDee+O
zhzFRd>^ZZ|eCd!+0ygl$sei?#XV{=HK0by`WdGW*q0qdL0eypt`t!^nS3&><e#4b`
zlrPTD@&<fJb+XA&=4;{16%=b3M`eYJ#3AM3Y#^8KE@K!8D>sSj5Dd$N0(t&39J+<I
z$|rLyB56YP>bhMFgSj`p2qJN1pvFjWT1R2Mwpt{j|Dtw^gN*MwF8_Aa%FRdeB~aNF
z5#CqEfeB)t2>W8LcZ&ebY|)fM31%J$LC2Vjj;ExTZ$|)MPU(uHd+)3yE}+4G_jDsd
zHnRiRun4-#N@Zlp`!+eW%}v0TZcS7L>+&a!hEFs9kmfPn*yGgTLqfTLS!GynSe+{8
z#mSzBeJqf*)-wrvS%k%4Q?Dm17`kePwJ9Qy!wRFBetUZd&i?{Fr!M-)0NAYp9n#f0
zw!s#pVusw=U?ixn!Bm0p)zg2ExVN`%B5b+T6j#w82UC8%SaO$_<ajzIfUp%I0dQjm
zGIx{!=&wH<Gi~#nfFGifHxKloAau+>?$kq02n+v~-7?PJFWAco(DzEmbYbY}W+N`u
zxV%YVJAisy(Dbr;5SA5tnBHlkXlDT5-Fz^f3C;Py0HgSz8r>ot{3)!Czz>rEn!jyR
z9`hvTB!Pb3KYQ*c4mgovzu7LV5wgG{*k<$xDiwJEQo{R73YQi5LMa?c5G=q}FMK)`
zW{dK;514-reJ+KCaUXA<2-OD)qW-$>Q*3g7S2h6g5BfCxik2S~*zfBhRf(oIciI}+
z$Y!|rF5swj#8;*LzUXD7yYHmF8(2>kJ;Nt_!<GI-0&&PTld2=pmgl6XQIwI6V;`k0
zk^elOKo*@Fa{&vve6BsV#G(^SneJV~rZ)rm>`)bOjMap#d>}&DByJ+~$k?Er@PI9s
zRTc#((-nNPAt#;*S8a<gGnilX|4l$!^CUWF6h-Q>gcA}c;^u-=xKNBtw$x8sR>5Nu
zu^jo71Et|Zt*3M70C59dI^WSRz1vL!dxj#<b4+KAEB|+x)J4-z!+1ci6K=EqpYK`4
z90L>8mu^uz?DVF{o9UIov7)v+Y^@{P3~@vd6(%^aP6#aUL=lvPFrDw3mm2HqiL103
zj@>ee$KWtuEg8^<Rq@p{5-yWsDxa2cS~u`dj&lET?J<Tz^E8NgAeLelXW|MIA`(;&
z8-{_^%20S^oO&QjhY0SpattT)FbA3S_p$Xef6ALckd?8AG&*^jR4z(jrAXN%UO>+@
zCjkZH>EUE30S#a#<+HHcxIg)@m#EB}s?w_Zhuy{W;glV?L6R>8ydWOItK$BL_+p1M
z-3iZO?_UYI>;qBS%7vcIjiG4%so@1$X>~4VZROgc3W>7Q9<z^df&(6zM^0M*!r8va
z_Q0jdt`{A+NyLv(ZO7RsVt*fx&;hh6Z2aJ+Pp%!(z2YlM|Jn54dyCKq2e!d?9pCrg
zap5#oCbm^*ryx61zki>bC6q8;YF&WpB!NiHQ{#!07|@O&4y=!qPdc?@W@mEHx>~6w
zy^W&{Rd^KWVWK%OjM2z9LFpi{q3*F|8c9a^Euu6R5X>tV-f5f*OtF#dxyvXPyF?7G
zqd@o^b1c)A-GbrKwb6V@vULNIhzV=j1oGV@O3$4v&CT|=(c0GezLt|Nqu_+f%4aw}
zOg9`P@>{L_{gugK8hY#d=P&we=a#z%O@Dd$3hbH`sakv0B!^T7r7syz@u|tl-wF>-
zFwKF|0Tg_3PB#;TW9Sl@IUrA6x9C+O3^A$n-v%Dmsg>m5WSAxST0^gVMIHBr&X@-G
zB!33pO8c}~+V`}S8JmM_{gcy*>&BXXn=xjHeeum}7~_pj`51CdRu}%*vT)R->yHBs
z+fKW}WT+um116Ab#u?;9Z_KcyE6b@7vU=LT7f}(n<J`bXsv^`nb*snPQqH`FbAi{@
zyx`dRqr$l!co!B*d6&dIg3IxRT8DZx0IsR)0Ucli9lYBT2|Eq-r~pu`RW{wOguz}4
zzC%|YHQ*p`dM|a`c>NfFviu*yV5k2F9ORt;fe{z{KWH#P{)cicpyGdc3WxG&m+!2a
zZc%1}Cq)EHt<k|Bv=Mfsi)+IOV?d<#2b)44Ca#tDin$kt6R0oqfy3(7QTzDoba$E3
zpMvXjhN`lg@Sy1{$&sc9r`IN|^1T~)EB%jb!_ViR?PA+l4bQ~LNnyb^*9Yn1Fi$tk
z`~OZ)`qm<^FGHShv?G7*SD_hU|D%e1#qDPOumMQ!R?!FeP7Kky5n$EKN2fl-XI?;u
zKHomB#AJlEp?=c;7hQle`3Mc#70+6pP{P+_CYzB5gkE=>G(j%HZ|_g<@9#Hn8yCWV
zlMk++-fu3lZQCD_LHLfD$Q3tW_?DPf1|IYz6Mg4bvYpM7R_o7iQh-5x_|Q;W+mLXj
zggbh4wA%BfDv-JHes6z2x&JkmCA`mqY0H-&ebNFwQ6@G9Chd>RR~o|U{-pk(BFT<`
zxIA6TmVl)tzj`G`{np_Lzx%pB^R}?$;l>)GKlIv8=eye;SPyyCX^!ML<K+xycjN>V
zOG{bpMPB!KA9U2$$O1{{#4!wUg!A--0dCta8d#xhptAfT)4|cB{NaAlyO{q<wTAS=
z`sCg!dimb}Hz^Xi7wtyJ-a9Z@2}Qw%Eyg|?6})`<+oEoy2Ln@q>FLGT>HUx*sl5rt
z6!?nzr(sW$G1oHfSo2C^06xzcpy!&Rh1l3{>uvV8{C56qkx{e$xo?`i=L|NT^xihY
z)b|V%G|o3p;QN{P^!3|e;CrGF&qW>b5WyA54haQ5!kP9(3CR7?kkq<HEtA;ro5~cX
zVI&^vvA!Mc!p`2liBXkvQ$g|8i+0HIMGax~e7R%C6cewp`e`UIzHh+mt<1v~c-s6%
ziu(9uc`0KAZ1DMV2@vJLR%L9_M(ldLR)Z4FKdZ4NBV!!Z|0%_w%h?vo2ZS8S4D4yD
zi!;B;F+$3`%Ply^(|H=aq15U61DJ!>Pwwt*1^pm)J{h2RZMjq-BhskJDwgN=u7T$p
z87`OgP7>I4d(;8ikeZuQXwYk>IhPZe6~|!pT8X9pn5K04uRO&hI*20C@0Jn@W2@LA
zd@y-CkcEKR#M{)gaB854C+OHbd<HG(=hI%-c})lHhkqg?#K%wSOv^T%>K99b4wnr-
zNcIFj$hyv}dqIknlPA;A&QKaF30I$?&YVa=P`1Jh_jN=O<g)?<&*hBWqBi$A20PQ-
z{{!+sO}M{&OGtgzc=dHX)PRtSTTWjO7j{y7z6+LGDLh>h2u=z-v4zL|k>##WbE`1q
z2k+t37fzk}_N^OD(I*AIY&+M#YjiNwE%G3rW8mBH7t|%wtLFb|5hm}vxbA^9EL-Hx
z0O6&rY{k34HY6W52&FI2Y-W>xctKytHk4F{uM}xS)zZuR%u}&HyIXK}`~$oas<nAd
zNxfn4f178OP${&g`NZ(}g}y`u$QFX|$g@Le1skJB`S*0sJ%Ylc`H{W(&_u=cFMS7_
zg?z>r*_PmU-=3~Ka-t_)cIu{ilQvHet-nkUX>a`o6#1TCmc&5)hBDG&j}DU1-MwX_
zwME~w80a8VV~`X6`%d5InZ^fPysoT_bK<2dbv<vBowWJ4XnVBiXvNQq@DY(x%TKl+
z<1#caHK&#d#QFpKj{B!bfeY@>J6cY2(Q7XfE<{75JW#P}I4?u9B>yIz(mQ|qNy3RA
zm)&tA-#tH%jt<Qa+}%ABJ)rzE=`b+V*Vfl^{*d~6H<X3wXjrRlPm?q-QZ{}bjnC3-
z6(Q)rFzJr&!f?(@F#X2jW%lETu~V<R*@WQJNyV)KsA_XZGaFgq{YEa1MUo6!C~&NX
z>(HtE!y9@QwzU5i<#9K8_ru3m=KZxRz0<JWZ$0xc?lqNtGrF1n2zD(&9PV|>^Ldry
zXWlBu2qc<!H@cafq}cF7l)Gpu4)incXIfy&9}uF+C>#|62bswKO@|@h!2u}JF(AbM
zk5m92`dtp=!`IK-rkgh)1!^!7<O{=&DmQ|Y1M?q$O``=PVh5zaWqk}o`s<t7$wdD1
zv;UuK{6BXSDz*LL7EeLopdsYk^#R|=GPXFBa#_Xw>3jD_tS}t2lbC4M05F;NUw-g1
zWDjv%VdgD2tthp-_<7B|B_(+?9oOt}jFtOU5Nh-k*5Mw7PV9G6I|^Mb)5joln4h)=
z%@_~7pSy?%$yPwqy0G@enM21$LpcrO>xPaJ`2fqBsW>mU0bz!^$Up`6iwPTd%F)-&
zF2v1jyGJt`XdZ94exUaJOzQ06zfTSkP92Z>KQR;16W7s3ALy0O8*{*6i~n3>71m7}
ze9E@%hPa;+M{4Gsx?!FwK^6iKPAf1<4pI3xzPiv@%a8)SmA6aPql^}k0P!Vwj2|{e
z8l1miD!Gx5#Oosm=8~`OZ?;}&<c*QrI4sW&U6Es5D!1XL`Q=1d1CV;GX)Lz45-j=j
zMWB;VKNUF8WM1|vfHJh9N2^DYpvz$pJO6z@Rfpn29UObba`O6|GpJ%zqiIVCTMD-m
z3BmM-;zXf@;kAPyB*ZnaRMh!>8A<b(C?1zE7!TZqWYrOrI>24GM^{2J$a{VQr{qdB
z3Hb)fForhKmsbZ@Tp2k;6$i=-!kcMKUzfwFbMwe&1?VI8X$2)2%+C5OM^w|KfRO97
z{eSN#{YyZvPa{tS8L%;Tc&+yCve^M<;e`#vjQMEESfzxkzhuRJoG`}>L+XBji7_7g
zm`@5ZV<TiyIlOvyzs{fZsOv-P;CD-xYMXmn=DgO+iZNE3mwv~$mSVLSAE7H+sojqV
zvP$?$cg$P$3!#gs8=JL^Y|$gH&>p&y-UKMbKB&+?hMsH&;SASlOm5?M*W!US9SnRb
zQB$O^BwPQ>x{R5PRAlG`&nKm=MHM6_t$Br`op~@D0X7DJz3w9}n3Uz|<G0jNEuBY4
zuk0zb9T#tsk^K_N&$m@(#LIY)1r;QY0Hu?OG0f~AoD%20O3WY>p}A~~hgk}NAPVnk
z<GdDr<5Na`q`4Zlde4R?Ja;J>thH9ZK6KtwSQE2W6NpLFp|1oowbVT!0b%JxmFoF}
zbgpE^;iTZ3it&Cuknw-4y~))b9CLD<WLBNfZ_xZc`rnJq%pD;Xp?WN>2W$0tP(|#*
zD8{1&Ges7x%G#8KtW?K$j)gRCVuy?v|5c4nUZ><o_28W`haLTpKk|88pmbm&kr&>a
zSy8Z|OIpg1Ovl=UdYN&uHH!pX1}wI;>-CdQ8J3myyx!2<wFFM1ZhDScxz8~8=MT4J
z(W59tD@M{YHIUPUUA+KakWr15D@DwpX7)pc;UBYK$XfAhxGQV=wz<otyWxu=%Rhdx
z2d6Wa-J#!4UNnT3NA4)bIiF34^5Gryss~zFlGRfeAh-Q0Hxje;ROPx-PtvkR4!3;6
z)V0Qn>-^z_iI;?%Ht>bKepYQ9sZk37yN0!-5b0Y9UdN^A*r=$z!KKLu<bl^>mL^qB
z$51ULd9vv%FK>KmLA+w;foB#cXX6f~`$wYv<ggD-&=#^G?-cgRlG1?^5pA_^$zNn6
zo=x&t_53MOx>k)3gH(^jD5i*R{9yO`!R&f;3o@N%#->rEuVwVnJsS(_%Z{B@RTo+o
z-u(PQz~|9?V|+YntVAlwOU!IBQ-|~G3fcQ`yFGwj50YBj|MC*0*D?EdEfnBD0eLp1
zl<(-xtS~DHh0-pRR1ZDY{rT$=RE6?inYT)68099LcZWgp*hw${g)z)D525+gpFtM=
z_A6&G3UH6l-gcq0;a8zLE>5#P5PIhS70(wi=$alXNWa$W)yRke54Q*6ASr2ZMw;{+
zG91v5;edt=84hU3a6m(b3<or1IG`azh65Th9MF)V|2GGu5@D1ve)=M#&Cb#${0WRt
zxi(B3SeyRO+#c2IXsUjDq-IIuY8r3ML<lkMuKfA48kLK65a|<i;AK6CPA~nTHwPrN
z{{AbyO0#~l?-~a&wReK2a%(bu)_WvhZiVXJq&fspKMqL2{EMS+thcwLuhV_Ly-#y@
z5pbO8?-={Juf4a|RgaPfe*LYP!cg@<6C~y|WrNy-rT%!t^>_`{Dv2I1Z;y%YdmfFq
z7K_JBKujjwN>@BCf$4L;Bh1{{*=A-eGk&nzJ3GC!=^QpLAgMwwS4dIa9q_6v2V~IO
z-P_&YWAFdA`%=%<BboqG7_xWwU$o!2Wxvo0QvIUet~JxIRRAf>O^#~nLk)ol;0)KP
zXIyQ7<FowypV&Mux?gB~lu=*A7m1-2nYtppc>saxxIpza8#B8sZL7@U*a$j<LH@7#
z?`ywns8!aaiyNb*n9r8V<#H*X)7v38x^h5%B5ltFxOD?A_gpw~>xfJ16bS^dXGs30
z=W>6yy`vGp6HQbFkbv}I@}#Cl@7HXQ!i$;HsGo*W&t+V)^o%!o-|3GGJZfZOzAgw%
z`KAcOeNzDlM5gxf8%nJrWNpR+8}k$DKC?<KuoQG2px}nf1m3YGhr_1Q*>X9XPp8xQ
zQn{!z0`=yA7l*p7=dQrz-nPr=glB*?e4iyS_t>xg%l<7c?*LX4`FQpL@LDZ^fd|b1
zT&@Ao1MH(9kW=?;3Bb)8!>4%H%)JJ8CNLGn;TKvW(J5aH6B39=nmM3VqyvM<caazX
z02MJwL_t(Jam^0xIKykE>{u{~0D2Av&>3_NF=%T%r_M^jg7}rvxs*5qFPF`x^hKbq
z9MFVsN6LWB0U1UzHn&^W`~)Sx+v4~79bT8phCbB+KMg=^-V*@+D8O^WzqtW^FZlag
z;}S9uMaM(#0zTvq13`#IK=b_z<WjS5Z(e`9RoFGd2Ag*=`Z^f=L;#)mM9FMce=Dp6
zavZ;c72gP<h-0x_&{ra&BL}nsd)OdW_kAUhdCB!g`F$hWdn|lm2jm|3w;=F)Zh<Ra
z!Qppe1pZ?m0H-36=)M42AvLmn6LlT+Hl5N8bUR&)ZTt@azLq7g`j~AiNa<23U)b|m
zeFCT#2ed+XAf(bjSOwtA3AHw>d;JSLAkRYtZl?r#&-u-9VSq0{(ik<PQ6BNfe6fIU
zYM&uET-@H__}$!odtGRIB&;45H36*QFc?%d1%T#;lL^x0Qc>Eg!XS|OY*=?guznm+
zS`Q6`2Dt7j3av{j0233_6)h^7xc&7U5TB~#A;*VzB_5vc(!7Wp0vCwIe35uO>Wjx(
zgd>thZ`-<AQ7(7AqOHaYzBK?CbZ+c&7YuGx+IXWhwE(n2x|GeqUXY0+a1N6YeU$=r
z<$&-sRPn$HfCEoK4IrYYIA4XriRG{7fVhfH05`MC-%sMvqXq-yl|M4&i}+9xE`INe
z1{$l;6h<oi?NGW?0WhuJpa4*=0Wj!X@jBdV8-lvkalgYozQS2t^7{R*$E#XHFydA!
z3Eo7ENht<|rMzrp!TS)n5DG1f%%Vj6w{SPKP`|q{2ArOlUcS#Ig2BzjiE8EK%R3-G
zdQ>gNR7x;29~<j?1X_3zFxoZcYvIfVBGDGkW0a>ODztJH07n4Q6#yG-N#X!nssIL^
z<G`rokyo+3<dLw=czFhUCCVhvYVx&3at*0AlP~9iSa&VZ%8F&ofeDVt#Bf0Ei4X*E
z<ftuhG+^R1J>&q=`p-GAI5F)GqZr|~b9;K?WtEvP51^^G6ti1``LkgZGeI0jULFMU
z=<jF?j|7j#BP15(RY6nzA30btz;G%Ru2^7BwM7DQtA)8la;pIN7%Z~aFLNkYC0X{n
z91K>HOW5mnSv=^K&mGJ$M(Vba%9e86{Zd7SNT-U~GA2BFn~T$v15%g`g=TGoBO@c+
z00+?lXX|&EiAbC1fOFgc-@JLlU~_t+X%;*`Kd;=*YXdkrIa>L_HlGKXYy=Qr{?BSD
z=6I753}(K*xTr)&BfQPW-e^SBp|PtTKuon10JmTZe-!}LwK=O}%nP30<Su~04Q8Qh
z!41FcSxPQ>EOa&LTv>Al$0gbC3~nqTqRI0>y~kK1fM~(Rd_JEoWzz+!<lt!?RipLg
zfC%71AXkk6)d1pNMF5o;aB&**-_7aiM6($1)tz_qC$7D^bLZ9jc`X1R>|GS?<m3Y!
z)|a1X0Eo}7mSU6=%s<os;)u)nL#vD6eT>I}Q_$t}9p!ypyeM5?Y*KRI0_^OV3WC2K
zb*^u2bu-sWGFT}@CzC4(-9|FG=8?uZfNXr#nZ(5ipp0=LwovE&%+*md9fvu{ZpsnP
z<#J*kSSqH&P}EZ<qAv%0hydCK*9X>x5Wt5G0N$RcB*2@Cw;_N4W|}$R@Ag;oC+^r$
zJ@4lm0i66GRW6T~nS5g7tk@oC0;rT?z8fC?p-BnGgwO?eY=!0*z`+<51rmt}%O;U{
z9k58+TTz3-WCW9sZBYxXPqiqtxj;U1HdqC44WWCyw&s=Dcyfcv7Kyr-oIx=JTbXx-
z^OrpP3xi|++OH#8ps4y$9+nnzRDwb|D=}`2l3otZ(w74wfKM^28!YfBFT9`);KZ^!
z;YuVjnE+%Kr>Es+4#)v~XSct4*YmqJfQdvR0JcP8?qmk!x%+d84;ldOO$q-XN-#4Y
zZR$y21W-~6e}O#*6n9-pS+GkT1d1Yb4o0@NMj)pEsETy`t(~$o^gJm51OcEdQ=Uga
zdosC1J+g(txHE~Np=8148b0&6SCU)XX&vi@QntXOKng6)n`nM%DCV;j2eeuZ2UNx9
zq0qX+hBD#aqw9A=gQ|~)z%l~J>9laiNi0q;vi%(JKlYvz^Y5=|4#AW7lYzO>lao&*
zxc}Ga=mRYW<fWL8!uoz}Qi4%(kSR=@;t^qi82y<b66G-<iE}hH3W3{DnVR6m=xy~j
zaS(1tJ3G4vAP&2-nICt>2j=AJV+WB%e{yA<NfsHi;9)PYW2(c`C=|Hc;a&^pOR034
zg)taRWm9-lOsCTYJsg{*CkMpvcp!ws@6)FX3k$OlUcdWa_Rc@FsVs}*C++=fNBl>L
z_mB67BM!b`X|N*AUkmwX8)Am7kR~ItwXuao?2JEFU6VBJnwF(qp^=?Pn}lG7wvbLm
z2MUF<C@3wR)=_DN0Sh}7y9**K?4P3l>^b+nG{5dk<H$0P@tx9_+w?U_-}}7pJ?EZt
z?+aCW=Sa%c>r<;_Bdcq$MvmY%3OKewQHVhltO1Cf@%Y_%{D8~{EDptJ5eSoIH>eYC
zPwa^%AVN~eh)C8S`E7zEv1%YNg#b>&kL%B$uV-OeHV)0O7xt_Eg`ofeI2#PiLZfFs
zI1~s55xSvZ;K&_}N(QJowB+L0O9vMkRd-AEc(x<?BxzSM0M0=631XL-%T7b)Nj5n>
zolGaWrGQnrxKJv!NI}R141W^}g{uHuMga5QUB~V9WdyJ^6KCWDj>&_NEdUS1Zvx|M
zcjIyZQ9=G&An@yN<*H!=<gL9u(w}ILb)fBOkM>9L=R`-<{$eD09fn_0F8J~=ygYaA
zVpU9_KuarkAb^jQMm{h<gi)~ST{^NfduJ%H^pE)?fhFvc2ZHk$fgqet1W=laqfx-g
zbT*sJra5-U;q)X=qZ5eeQOC@aCJ08%rGV<<g;00L1OkZhZ}&GB7S##>8LVBsx*B#)
z5rAv3T$+iKDIi9{K1A@RoD{%#0l)({DIm$m4FJ@KV&qjY`aU*Ny{MJ}5g8HD2iriB
zi_6d;bV@5mNYY?*MgkzE;uZn{B(Ko{^T7dds;b|?;Zg7&sBW(lyWrV?8yu~zjz$Mx
z3NA>B5i|g^81y1>D216Ugwts?nMr0T3W0D^wG^<NKoq~*&P?jTM5<c=SUFxrxwxxS
zZvV}Z)sf|K$Wtbc*HFN-x!eXK=sUZ=mI6{la+5Q-`)?_LTSGC@Byd3kIV2*u-5ZI-
zV$t>(XEv=qP~vF3{L{LqN1zdy=j-QQ4jTeE6gWsX)R_$)@d8&p9*_S~@Sul@yzafg
zA6luY0G|y6qyQpg+4N*G8J?TQ*mpXc0o1}wb~-(&-99YouzWyCDrE0oCkI&~M9;-d
z4Pp@DryvBo;_@119Y9pRoTh*q`*Y+7ZsckL7>~!1J&Z(*0Q~*$469&@JBe~E^alI)
zkmo0g6AWBky&gd?hLMzr>Hr1<fuZ?3cV>^^<7|s};Na|+fk5EVy#a5-y?JbXIgibO
zdrQH9P{7JAm{I>5#;`X$mz+*#Nd~j&EXE*{^p1AOWPbTD#8e6>01Qo}GJf8Ddty-v
zAm!qwM)HHsj=}uu)YR2wnGd)zHg<Ny*YrBK()7c|*&n0;#!G^b{N~JoJlMW701%&~
zp_s3$>+q`qWFj8X8b<Yi*e`C?13sSwNm;%CkQ0Cycc6&}eG@2dip}7HTBU#(1kYvh
z0A{n0otw*~=Z1&V*<=`0eQJ_z*aRbiCR4zaRt`gh(6U4bjpb{pkn5|fQ#2r5l8GxS
zVD5EO6S;mHIgCMk*c#hk%Lk0#1wQ^6itEfJ0|2$^d`TUC6@ZMv9#Ij^j0;k+|3vj!
zCji$o0I~sL1sc4n=fp!KE3jq3t!<FD!9ttt;ZaZ<yp^9XJ2we1i9TRvE(sY#eK<_Y
zS11zuuz91uN(D@bD%6lj#UYAS0NOxV-KxZznnDx@WeS*kjnw&m%I)7zF^F&MY$bq&
z>VrW}0M4v^#`*Z#X50usF%)AQf#@$Qd_G&OJ<+dq!HKBhtT=*h`sK@u3dr*j4BUsn
z;l4to1q&7^ZUe<{?b(wUs_gSu<XkY~2xBjt#!xPds%IDX7GuQ@-wX+1Qz;-GvWpXo
zq8^ZBaN>4#^)5ys`Bfo-*GUFP)=EpGia|*3>;?@#YmJRuSv{Z)Y@3&K0B2?di}9Jw
z%^502xM}3%QFZ>eH31afAJxC~1GXYD9&7KfIV;W+4l~1a7=xAumBYfrU_JKm3Wg{y
zS7kja1|He$6O1^RU5DOox^>XawK4*Rc@XYSJqU#!q`Jc(owJAsd3<eT6&=ClK~`3B
ztSO*24H#n&y(Jo@3P=#o#5KEgsqiQocU8k-7I^Xfb{@MYL0Mo?g3ytOV6$cqhy5^9
zYVg2a`+B?!B|UHr3x4Hw9jqD!WH3E9mrha%pm`VIH`&@SG+)u~u?-K~5JmZ<SteF+
z;e%ohIj>k5A^bNZD~%r*Wq>6%UMn-exM$mszc<#Q6-V2kBerMTf3_wS3>>ZAR(E~Y
zN;3o{*T=Bt^qJVqw>p-6yD8gL6-dITZL1VidUi{Gp$!`otsZT&^<}HMpirG2yY><`
zroYPvm{?w>zFoy<W6}i8|9O?2Uz-Bfr48D7W(Iw@kyZS;O=7i6)ot~FV3Ra|K7xwE
z>NDC={t9Nl`OQbWKA^`YzVrvt0Lv@|wCv*p&{`qYGD`t1vlP%W%Pa-7%u+zhEVC5Q
zGD`t1v&>RJ%Pa-_Wo-K#603C&^SbWt!r!AH-FR2yo8#1NKmRaQq~x|arY5{sjY$>I
zZr?T^OqG>NjbGMv`rcz=EH`6PzXG{h1S<OFhSx1K7l0;IKszYiDr{4&<ZSTk_a>68
z*WB3Ss>A$sPs-tb0}-@CxcftG(&$~ct7u@Ljyp@f49gisH7fIadm7yQ{jR%@QUUR#
zPJ|}HwPs)_(6Dl2Y#$Xc%Wfs&YHq5>e8=jWna#k_d(tUAy9#u7eV|>wCa>AkYPxEE
ztns(cO6{%FV1HCU?}_uDwsp4cKK+HOvX0VHz{+zPp12SSJ*Y(>hm$wPZrmpT6<#%S
z$+5es`LAcTwcSlVZ(Ri9E1qvV?~vaJrh9aBw6EMorBC%qZM3gT4j{f+M@L7kZdHMI
zxBf1y@bFIl?{IKmY4de<wxM<UI(PM$hd>i5pq*xC(n{sE2;2ftffHjV%lG5Z)70$P
zzIRoix9K>jbpp8ajN2H%uFGXc0G2<~RrSo)zH$JmuD?GTi^iBCf(i^4@OxE2a8P#0
zIQ)5sudQgEZAZZ@j-UxEq9M$?7efXFdYDH)_^m5rD=y$1R**xr^or)-YC1zpDywLE
zoLSP|YO3&6)xDTl@rCRPD+BP9@EBQzb_f8we!N&_>s?*f%AUA=t!uO|bx~%0qY?m-
zITnjX5Wq-6-2YI1S-c|bZryq{2!pR~iS{eWMZ)2jCVoZpoixi5m8Mfb1=I%<(7h<r
zK*qU8A7DWa9o|N;b7&zUtWZD#P$|5g_)FR0mH>#%6$qoIem6ms*#dyPa*b~R;N{Zg
zg^;CdUFA@5NTJe6RzQ&KE4)8|SRxXQMq{{%B=%_TVAYX&Bba;pMs(M2-in{zRFTEu
zFyZH;4T0E6V(9zaBm|mG0m=Uhg^<A1L=}N_;uTddTxO~YTm{Fz6$G%gp`o#O=@$TW
zw76P&6wQ-&V!J^PkPFQ!05Mcl54X}{ETZ|sDS}68_V|075kS;i$Dziuxx55m9|EXu
z4eD`4A*e({H&q9aR}KK``&IyGV|x=wUnJV!K^W4b?9NQ;TLkV|o`wrlhTr*Tw-86Q
zYJCp(j<(L;)?=rAox6Xtqs@2bbN5MKTjwFLR!BACFBGB~>6HXxKY0B9%F4=pGWWg}
zYQlZ=1jo>B{IfWtSMP#xi$;Vo#!q8Ys3M0$qDd#P5<mv7UCpPC(<$`8i+??SDi$1N
z(D0X?y{C2~fC{wiYVO?!@2h~ydnq8TbcxtS`p5H|YcUPMSk;si4tbQkceFyW`ex(}
zedzIbNMycZYO?}Ye4k*K%N&PYZok|6M>oL1&QCheb5q<q*jx%&;14BGg^T6AFnN79
zw#;?ZCxVa_!jGOX0?^k&x^<<g2w)2~Pe}kosrX{&&NH7j_Z|X|^FNQDK7IW7>Hpe0
zf7dj^FpfXyZ7nVld&4c4B{zr#mt-n9Ma($_ZfFT;X@nqG0+yPJRgoS@<RG1jamvtw
zLObLi$Y7yM1_ukF88VgoKl**%^T&IqkQO>P<aM~$mlxsm<M(;KkNCXXL{?Fc*>PJ3
zfZH`}h{uj|a#KuS0Yxk3FRtrySK&ES3A%CJ8#x4P^cI^=DZ8|Hp?^=BEd<_Y7r#Bv
zyK*=eZ1Mj+!zGy8Z@1hRLUFo09MLisYv-ZkY9fBlXUtX=L&W655vdOfxT5|i#*b5?
zpcBa|taiOoegxu1dzO{&F@U8zT&~lba$AZ3fXQ8a<M)yw06QxH)Tq5{$M_M?(NFLP
z0LNpCUSl;5Fgq4i{0*t{BH&93i0O$xl>l^4PTU}XeOO|?z3|=zT5!M3<^=dvt5vTG
z1e;Ah@n)$61IwXi&xc)q49~MFY)PmTqtXF#KC_1GRn_?Kb1E{7eO_v>MGRiE4yjZA
zfE^tMy|6|(pq2+OqffXX8RO&+H_-FTf!QS&JOwaWrnLDt04mgu#h+*PZQG8_0UTu1
zimulpMF!9)>vnOcXs4u-U_b#6UpAHi<Y@@NMuPzi@09>V_|=9VJaLM<_jRIttk;|2
z&R34`yySEj!y(~|1Em;+Dv-NJa=jB)3TuVO)<ciz5P!y;KLFT=6Z!moN?-z?;T;4p
zLQ%e6Bc41J04h-d;Homr48UYtPtE{T;9EEc>|mlTD`3hl5pARv01gJ0D*Uf-!A3b%
z*%_x_)wY8n`0O76Ji8ab_pRZTa|!wLwl18j2`oui0U0$0a3TRXnXgJOX6c1p^Ejl6
zFCc-1G(Gf)mMeTj3;r0uH~lOn`r?Vf^_EQ}eVcr$Isn8w7nK!oMH$8i&@`t%y4{}x
z0>BsmR5oG^;9%@4AOmRcP_E1Xg2H#dG9_)b3Hgrz)>}h?UiFeOTn5lD!En`Yg#yZ@
r7z7UJpLq~q4Mq&AXdbNzfIR*HrRV83y^i-T00000NkvXXu0mjf8axM_

literal 0
HcmV?d00001

diff --git a/website/src/data/users.tsx b/website/src/data/users.tsx
index 2e78d627d001..01d5fcb82643 100644
--- a/website/src/data/users.tsx
+++ b/website/src/data/users.tsx
@@ -986,6 +986,14 @@ const Users: User[] = [
     source: 'https://github.com/Joelpo/joelpo.github.io',
     tags: ['personal', 'opensource'],
   },
+  {
+    title: 'Junjie',
+    description: 'A personal website',
+    preview: require('./showcase/junjie.png'),
+    website: 'https://junjieweb.github.io',
+    source: 'https://github.com/junjieweb/junjieweb.github.io',
+    tags: ['personal', 'opensource'],
+  },
   {
     title: 'K3ai',
     description:

From dbd161d67ca912c984803a9338a2612a754b1c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= <slorber@users.noreply.github.com>
Date: Fri, 27 May 2022 10:41:15 +0200
Subject: [PATCH 14/16] fix(create-docusaurus): potential security issue with
 command injection (#7507)

---
 packages/create-docusaurus/package.json       |  1 +
 packages/create-docusaurus/src/index.ts       |  9 ++++--
 .../src/__tests__/shellUtils.test.ts          | 19 ++++++++++++
 packages/docusaurus-utils/src/gitUtils.ts     | 31 +++++++------------
 packages/docusaurus-utils/src/index.ts        |  1 +
 packages/docusaurus-utils/src/shellUtils.ts   | 18 +++++++++++
 project-words.txt                             |  2 ++
 7 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 packages/docusaurus-utils/src/__tests__/shellUtils.test.ts
 create mode 100644 packages/docusaurus-utils/src/shellUtils.ts

diff --git a/packages/create-docusaurus/package.json b/packages/create-docusaurus/package.json
index 46ae2253e1b4..f4ca79dcd026 100755
--- a/packages/create-docusaurus/package.json
+++ b/packages/create-docusaurus/package.json
@@ -23,6 +23,7 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/logger": "2.0.0-beta.20",
+    "@docusaurus/utils": "2.0.0-beta.20",
     "commander": "^5.1.0",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",
diff --git a/packages/create-docusaurus/src/index.ts b/packages/create-docusaurus/src/index.ts
index 27d53f50fd59..b996c3e90b6b 100755
--- a/packages/create-docusaurus/src/index.ts
+++ b/packages/create-docusaurus/src/index.ts
@@ -13,6 +13,7 @@ import logger from '@docusaurus/logger';
 import shell from 'shelljs';
 import prompts, {type Choice} from 'prompts';
 import supportsColor from 'supports-color';
+import {escapeShellArg} from '@docusaurus/utils';
 
 type CLIOptions = {
   packageManager?: PackageManager;
@@ -463,9 +464,11 @@ export default async function init(
   logger.info('Creating new Docusaurus project...');
 
   if (source.type === 'git') {
-    logger.info`Cloning Git template url=${source.url}...`;
-    const command = await getGitCommand(source.strategy);
-    if (shell.exec(`${command} ${source.url} ${dest}`).code !== 0) {
+    const gitCommand = await getGitCommand(source.strategy);
+    const gitCloneCommand = `${gitCommand} ${escapeShellArg(
+      source.url,
+    )} ${escapeShellArg(dest)}`;
+    if (shell.exec(gitCloneCommand).code !== 0) {
       logger.error`Cloning Git template failed!`;
       process.exit(1);
     }
diff --git a/packages/docusaurus-utils/src/__tests__/shellUtils.test.ts b/packages/docusaurus-utils/src/__tests__/shellUtils.test.ts
new file mode 100644
index 000000000000..adc64d944350
--- /dev/null
+++ b/packages/docusaurus-utils/src/__tests__/shellUtils.test.ts
@@ -0,0 +1,19 @@
+/**
+ * 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 {escapeShellArg} from '../shellUtils';
+
+describe('shellUtils', () => {
+  it('escapeShellArg', () => {
+    expect(escapeShellArg('hello')).toBe("'hello'");
+    expect(escapeShellArg('*')).toBe("'*'");
+    expect(escapeShellArg('hello world')).toBe("'hello world'");
+    expect(escapeShellArg("'hello'")).toBe("\\''hello'\\'");
+    expect(escapeShellArg('$(pwd)')).toBe("'$(pwd)'");
+    expect(escapeShellArg('hello$(pwd)')).toBe("'hello$(pwd)'");
+  });
+});
diff --git a/packages/docusaurus-utils/src/gitUtils.ts b/packages/docusaurus-utils/src/gitUtils.ts
index 4d7ffde633ee..00e15658c9a4 100644
--- a/packages/docusaurus-utils/src/gitUtils.ts
+++ b/packages/docusaurus-utils/src/gitUtils.ts
@@ -97,26 +97,19 @@ export function getFileCommitDate(
     );
   }
 
-  let formatArg = '--format=%ct';
-  if (includeAuthor) {
-    formatArg += ',%an';
-  }
-
-  let extraArgs = '--max-count=1';
-  if (age === 'oldest') {
-    // --follow is necessary to follow file renames
-    // --diff-filter=A ensures we only get the commit which (A)dded the file
-    extraArgs += ' --follow --diff-filter=A';
-  }
+  const args = [
+    `--format=%ct${includeAuthor ? ',%an' : ''}`,
+    '--max-count=1',
+    age === 'oldest' ? '--follow --diff-filter=A' : undefined,
+  ]
+    .filter(Boolean)
+    .join(' ');
 
-  const result = shell.exec(
-    `git log ${extraArgs} ${formatArg} -- "${path.basename(file)}"`,
-    {
-      // Setting cwd is important, see: https://github.com/facebook/docusaurus/pull/5048
-      cwd: path.dirname(file),
-      silent: true,
-    },
-  );
+  const result = shell.exec(`git log ${args} -- "${path.basename(file)}"`, {
+    // Setting cwd is important, see: https://github.com/facebook/docusaurus/pull/5048
+    cwd: path.dirname(file),
+    silent: true,
+  });
   if (result.code !== 0) {
     throw new Error(
       `Failed to retrieve the git history for file "${file}" with exit code ${result.code}: ${result.stderr}`,
diff --git a/packages/docusaurus-utils/src/index.ts b/packages/docusaurus-utils/src/index.ts
index fb2c66435ea2..520f5f73aab2 100644
--- a/packages/docusaurus-utils/src/index.ts
+++ b/packages/docusaurus-utils/src/index.ts
@@ -96,6 +96,7 @@ export {
   createAbsoluteFilePathMatcher,
 } from './globUtils';
 export {getFileLoaderUtils} from './webpackUtils';
+export {escapeShellArg} from './shellUtils';
 export {
   getDataFilePath,
   getDataFileData,
diff --git a/packages/docusaurus-utils/src/shellUtils.ts b/packages/docusaurus-utils/src/shellUtils.ts
new file mode 100644
index 000000000000..25536a3c1fed
--- /dev/null
+++ b/packages/docusaurus-utils/src/shellUtils.ts
@@ -0,0 +1,18 @@
+/**
+ * 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.
+ */
+
+// TODO move from shelljs to execa later?
+// Execa is well maintained and widely used
+// Even shelljs recommends execa for security / escaping:
+// https://github.com/shelljs/shelljs/wiki/Security-guidelines
+
+// Inspired by https://github.com/xxorax/node-shell-escape/blob/master/shell-escape.js
+export function escapeShellArg(s: string): string {
+  let res = `'${s.replace(/'/g, "'\\''")}'`;
+  res = res.replace(/^(?:'')+/g, '').replace(/\\'''/g, "\\'");
+  return res;
+}
diff --git a/project-words.txt b/project-words.txt
index 2e029e7f7c3f..9ca37195ee29 100644
--- a/project-words.txt
+++ b/project-words.txt
@@ -87,6 +87,8 @@ esbuild
 eslintcache
 estree
 evaluable
+execa
+Execa
 externalwaiting
 failfast
 fbid

From 35e63515e63e9edb0ba59a8a7511fd747b979e7c Mon Sep 17 00:00:00 2001
From: James <5511220+Zamiell@users.noreply.github.com>
Date: Fri, 27 May 2022 04:45:53 -0400
Subject: [PATCH 15/16] feat: make docusaurus serve automatically open in
 browser (#7500)

* feat: add automatic url open to npm run serve

* fix

* adding ci check

* add docs

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 packages/docusaurus/bin/docusaurus.mjs    |  4 ++++
 packages/docusaurus/src/commands/serve.ts | 11 ++++++++---
 website/docs/cli.md                       |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/docusaurus/bin/docusaurus.mjs b/packages/docusaurus/bin/docusaurus.mjs
index 820d26e7de9a..8ae3d348ecf6 100755
--- a/packages/docusaurus/bin/docusaurus.mjs
+++ b/packages/docusaurus/bin/docusaurus.mjs
@@ -148,6 +148,10 @@ cli
   .option('-p, --port <port>', 'use specified port (default: 3000)')
   .option('--build', 'build website before serving (default: false)')
   .option('-h, --host <host>', 'use specified host (default: localhost)')
+  .option(
+    '--no-open',
+    'do not open page in the browser (default: false, or true in CI)',
+  )
   .action(async (siteDir, options) =>
     serve(await resolveDir(siteDir), options),
   );
diff --git a/packages/docusaurus/src/commands/serve.ts b/packages/docusaurus/src/commands/serve.ts
index 7777d448f734..0eb24b677f1b 100644
--- a/packages/docusaurus/src/commands/serve.ts
+++ b/packages/docusaurus/src/commands/serve.ts
@@ -10,6 +10,7 @@ import path from 'path';
 import logger from '@docusaurus/logger';
 import {DEFAULT_BUILD_DIR_NAME} from '@docusaurus/utils';
 import serveHandler from 'serve-handler';
+import openBrowser from 'react-dev-utils/openBrowser';
 import {loadSiteConfig} from '../server/config';
 import {build} from './build';
 import {getHostPort, type HostPortOptions} from '../server/getHostPort';
@@ -19,6 +20,7 @@ export type ServeCLIOptions = HostPortOptions &
   Pick<LoadContextOptions, 'config'> & {
     dir?: string;
     build?: boolean;
+    open?: boolean;
   };
 
 export async function serve(
@@ -76,8 +78,11 @@ export async function serve(
     });
   });
 
-  logger.success`Serving path=${buildDir} directory at: url=${
-    servingUrl + baseUrl
-  }`;
+  const url = servingUrl + baseUrl;
+  logger.success`Serving path=${buildDir} directory at: url=${url}`;
   server.listen(port);
+
+  if (cliOptions.open && !process.env.CI) {
+    openBrowser(url);
+  }
 }
diff --git a/website/docs/cli.md b/website/docs/cli.md
index e19840601722..c1b79ddd9d87 100644
--- a/website/docs/cli.md
+++ b/website/docs/cli.md
@@ -150,6 +150,7 @@ Serve your built website locally.
 | `--build` | `false` | Build website before serving |
 | `--config` | `undefined` | Path to docusaurus config file, default to `[siteDir]/docusaurus.config.js` |
 | `--host` | `localhost` | Specify a host to use. For example, if you want your server to be accessible externally, you can use `--host 0.0.0.0`. |
+| `--no-open` | `false` locally, `true` in CI | Do not open a browser window to the server location. |
 
 ### `docusaurus clear [siteDir]` {#docusaurus-clear-sitedir}
 

From be912c698a3c6115ba7e815c652f892d63134079 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Fri, 27 May 2022 17:11:58 +0800
Subject: [PATCH 16/16] feat(core): support docusaurus.config.cjs as default
 file name (#7371)

---
 packages/docusaurus-utils/src/constants.ts    |  5 ++-
 .../__fixtures__/config/docusaurus.config.cjs |  5 +++
 .../__snapshots__/config.test.ts.snap         | 36 +++++++++++++++++++
 .../src/server/__tests__/config.test.ts       |  8 ++++-
 .../server/__tests__/configValidation.test.ts | 19 +++++-----
 packages/docusaurus/src/server/config.ts      | 33 +++++++++++++----
 .../docusaurus/src/server/configValidation.ts | 12 +++----
 packages/docusaurus/src/server/index.ts       |  2 +-
 8 files changed, 97 insertions(+), 23 deletions(-)
 create mode 100644 packages/docusaurus/src/server/__tests__/__fixtures__/config/docusaurus.config.cjs

diff --git a/packages/docusaurus-utils/src/constants.ts b/packages/docusaurus-utils/src/constants.ts
index be9405eab9bd..9f8c452669bb 100644
--- a/packages/docusaurus-utils/src/constants.ts
+++ b/packages/docusaurus-utils/src/constants.ts
@@ -30,8 +30,11 @@ export const DEFAULT_BUILD_DIR_NAME = 'build';
 /**
  * Can be overridden with cli option `--config`. Code should generally use
  * `context.siteConfigPath` instead (which is always absolute).
+ *
+ * This does not have extensions, so that we can substitute different ones
+ * when resolving the path.
  */
-export const DEFAULT_CONFIG_FILE_NAME = 'docusaurus.config.js';
+export const DEFAULT_CONFIG_FILE_NAME = 'docusaurus.config';
 
 /** Can be absolute or relative to site directory. */
 export const BABEL_CONFIG_FILE_NAME =
diff --git a/packages/docusaurus/src/server/__tests__/__fixtures__/config/docusaurus.config.cjs b/packages/docusaurus/src/server/__tests__/__fixtures__/config/docusaurus.config.cjs
new file mode 100644
index 000000000000..22c3d0c6ceef
--- /dev/null
+++ b/packages/docusaurus/src/server/__tests__/__fixtures__/config/docusaurus.config.cjs
@@ -0,0 +1,5 @@
+module.exports = {
+  title: 'title',
+  url: 'https://example.com',
+  baseUrl: '/'
+};
diff --git a/packages/docusaurus/src/server/__tests__/__snapshots__/config.test.ts.snap b/packages/docusaurus/src/server/__tests__/__snapshots__/config.test.ts.snap
index abaaab349c57..2c20bb59c885 100644
--- a/packages/docusaurus/src/server/__tests__/__snapshots__/config.test.ts.snap
+++ b/packages/docusaurus/src/server/__tests__/__snapshots__/config.test.ts.snap
@@ -1,5 +1,41 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`loadSiteConfig website with .cjs siteConfig 1`] = `
+{
+  "siteConfig": {
+    "baseUrl": "/",
+    "baseUrlIssueBanner": true,
+    "clientModules": [],
+    "customFields": {},
+    "i18n": {
+      "defaultLocale": "en",
+      "localeConfigs": {},
+      "locales": [
+        "en",
+      ],
+    },
+    "noIndex": false,
+    "onBrokenLinks": "throw",
+    "onBrokenMarkdownLinks": "warn",
+    "onDuplicateRoutes": "warn",
+    "plugins": [],
+    "presets": [],
+    "scripts": [],
+    "staticDirectories": [
+      "static",
+    ],
+    "stylesheets": [],
+    "tagline": "",
+    "themeConfig": {},
+    "themes": [],
+    "title": "title",
+    "titleDelimiter": "|",
+    "url": "https://example.com",
+  },
+  "siteConfigPath": "<PROJECT_ROOT>/packages/docusaurus/src/server/__tests__/__fixtures__/config/docusaurus.config.cjs",
+}
+`;
+
 exports[`loadSiteConfig website with valid async config 1`] = `
 {
   "siteConfig": {
diff --git a/packages/docusaurus/src/server/__tests__/config.test.ts b/packages/docusaurus/src/server/__tests__/config.test.ts
index 4965d60f5a05..d66a56c4f325 100644
--- a/packages/docusaurus/src/server/__tests__/config.test.ts
+++ b/packages/docusaurus/src/server/__tests__/config.test.ts
@@ -19,6 +19,12 @@ describe('loadSiteConfig', () => {
     expect(config).not.toEqual({});
   });
 
+  it('website with .cjs siteConfig', async () => {
+    const config = await loadSiteConfig({siteDir});
+    expect(config).toMatchSnapshot();
+    expect(config).not.toEqual({});
+  });
+
   it('website with valid config creator function', async () => {
     const config = await loadSiteConfig({
       siteDir,
@@ -65,7 +71,7 @@ describe('loadSiteConfig', () => {
         customConfigFilePath: 'wrong.config.js',
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`
-            "These field(s) ("useLessField",) are not recognized in docusaurus.config.js.
+            "These field(s) ("useLessField",) are not recognized in wrong.config.js.
             If you still want these fields to be in your configuration, put them in the "customFields" field.
             See https://docusaurus.io/docs/api/docusaurus-config/#customfields"
           `);
diff --git a/packages/docusaurus/src/server/__tests__/configValidation.test.ts b/packages/docusaurus/src/server/__tests__/configValidation.test.ts
index bd42f1f96569..a2aad2aeca58 100644
--- a/packages/docusaurus/src/server/__tests__/configValidation.test.ts
+++ b/packages/docusaurus/src/server/__tests__/configValidation.test.ts
@@ -19,7 +19,7 @@ const baseConfig = {
 } as Config;
 
 const normalizeConfig = (config: Partial<Config>) =>
-  validateConfig({...baseConfig, ...config});
+  validateConfig({...baseConfig, ...config}, 'docusaurus.config.js');
 
 describe('normalizeConfig', () => {
   it('normalizes empty config', () => {
@@ -296,13 +296,16 @@ describe('normalizeConfig', () => {
 
   it('throws error for required fields', () => {
     expect(() =>
-      validateConfig({
-        invalidField: true,
-        presets: {},
-        stylesheets: {},
-        themes: {},
-        scripts: {},
-      }),
+      validateConfig(
+        {
+          invalidField: true,
+          presets: {},
+          stylesheets: {},
+          themes: {},
+          scripts: {},
+        },
+        'docusaurus.config.js',
+      ),
     ).toThrowErrorMatchingSnapshot();
   });
 });
diff --git a/packages/docusaurus/src/server/config.ts b/packages/docusaurus/src/server/config.ts
index 73cccc613654..8f2fa9c9129e 100644
--- a/packages/docusaurus/src/server/config.ts
+++ b/packages/docusaurus/src/server/config.ts
@@ -8,10 +8,29 @@
 import path from 'path';
 import fs from 'fs-extra';
 import importFresh from 'import-fresh';
-import {DEFAULT_CONFIG_FILE_NAME} from '@docusaurus/utils';
+import logger from '@docusaurus/logger';
+import {DEFAULT_CONFIG_FILE_NAME, findAsyncSequential} from '@docusaurus/utils';
 import {validateConfig} from './configValidation';
 import type {LoadContext} from '@docusaurus/types';
 
+async function findConfig(siteDir: string) {
+  // We could support .mjs, .ts, etc. in the future
+  const candidates = ['.js', '.cjs'].map(
+    (ext) => DEFAULT_CONFIG_FILE_NAME + ext,
+  );
+  const configPath = await findAsyncSequential(
+    candidates.map((file) => path.join(siteDir, file)),
+    fs.pathExists,
+  );
+  if (!configPath) {
+    logger.error('No config file found.');
+    logger.info`Expected one of:${candidates}
+You can provide a custom config path with the code=${'--config'} option.`;
+    throw new Error();
+  }
+  return configPath;
+}
+
 export async function loadSiteConfig({
   siteDir,
   customConfigFilePath,
@@ -19,10 +38,9 @@ export async function loadSiteConfig({
   siteDir: string;
   customConfigFilePath?: string;
 }): Promise<Pick<LoadContext, 'siteConfig' | 'siteConfigPath'>> {
-  const siteConfigPath = path.resolve(
-    siteDir,
-    customConfigFilePath ?? DEFAULT_CONFIG_FILE_NAME,
-  );
+  const siteConfigPath = customConfigFilePath
+    ? path.resolve(siteDir, customConfigFilePath)
+    : await findConfig(siteDir);
 
   if (!(await fs.pathExists(siteConfigPath))) {
     throw new Error(`Config file at "${siteConfigPath}" not found.`);
@@ -35,6 +53,9 @@ export async function loadSiteConfig({
       ? await importedConfig()
       : await importedConfig;
 
-  const siteConfig = validateConfig(loadedConfig);
+  const siteConfig = validateConfig(
+    loadedConfig,
+    path.relative(siteDir, siteConfigPath),
+  );
   return {siteConfig, siteConfigPath};
 }
diff --git a/packages/docusaurus/src/server/configValidation.ts b/packages/docusaurus/src/server/configValidation.ts
index f5ef6a3cc9a4..15a66776b19d 100644
--- a/packages/docusaurus/src/server/configValidation.ts
+++ b/packages/docusaurus/src/server/configValidation.ts
@@ -5,10 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {
-  DEFAULT_CONFIG_FILE_NAME,
-  DEFAULT_STATIC_DIR_NAME,
-} from '@docusaurus/utils';
+import {DEFAULT_STATIC_DIR_NAME} from '@docusaurus/utils';
 import {Joi, URISchema, printWarning} from '@docusaurus/utils-validation';
 import type {DocusaurusConfig, I18nConfig} from '@docusaurus/types';
 
@@ -239,7 +236,10 @@ export const ConfigSchema = Joi.object<DocusaurusConfig>({
 });
 
 // TODO move to @docusaurus/utils-validation
-export function validateConfig(config: unknown): DocusaurusConfig {
+export function validateConfig(
+  config: unknown,
+  siteConfigPath: string,
+): DocusaurusConfig {
   const {error, warning, value} = ConfigSchema.validate(config, {
     abortEarly: false,
   });
@@ -263,7 +263,7 @@ export function validateConfig(config: unknown): DocusaurusConfig {
       '',
     );
     formattedError = unknownFields
-      ? `${formattedError}These field(s) (${unknownFields}) are not recognized in ${DEFAULT_CONFIG_FILE_NAME}.\nIf you still want these fields to be in your configuration, put them in the "customFields" field.\nSee https://docusaurus.io/docs/api/docusaurus-config/#customfields`
+      ? `${formattedError}These field(s) (${unknownFields}) are not recognized in ${siteConfigPath}.\nIf you still want these fields to be in your configuration, put them in the "customFields" field.\nSee https://docusaurus.io/docs/api/docusaurus-config/#customfields`
       : formattedError;
     throw new Error(formattedError);
   } else {
diff --git a/packages/docusaurus/src/server/index.ts b/packages/docusaurus/src/server/index.ts
index 4417f0f7f515..90908237b04f 100644
--- a/packages/docusaurus/src/server/index.ts
+++ b/packages/docusaurus/src/server/index.ts
@@ -156,7 +156,7 @@ next build. You can clear all build artifacts (including this folder) with the
 
   const genSiteConfig = generate(
     generatedFilesDir,
-    DEFAULT_CONFIG_FILE_NAME,
+    `${DEFAULT_CONFIG_FILE_NAME}.mjs`,
     `/*
  * AUTOGENERATED - DON'T EDIT
  * Your edits in this file will be overwritten in the next build!