From 1db787144686ef84e1cc057d1072a87c490c4985 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 10:41:00 +0800
Subject: [PATCH 01/43] chore(deps): bump actions/dependency-review-action from
 1.0.1 to 1.0.2 (#7476)

Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/39e692fa323107ef86d8fdac0067ce647f239bd7...a9c83d3af6b9031e20feba03b904645bb23d1dab)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/dependency-review.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 32fc4d96a997..786484e2847d 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -15,4 +15,4 @@ jobs:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b #v3
       - name: Dependency Review
-        uses: actions/dependency-review-action@39e692fa323107ef86d8fdac0067ce647f239bd7 # v1
+        uses: actions/dependency-review-action@a9c83d3af6b9031e20feba03b904645bb23d1dab # v1

From 222bf3c0919a17d8caebadc823021058dd3ac4ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 10:41:17 +0800
Subject: [PATCH 02/43] chore(deps): bump github/codeql-action from 2.1.10 to
 2.1.11 (#7475)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.10 to 2.1.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/2f58583a1b24a7d3c7034f6bf9fa506d23b1183b...a3a6c128d771b6b9bdebb1c9d0583ebd2728a108)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 91f6c42c4f64..639230777941 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,9 +34,9 @@ jobs:
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2f58583a1b24a7d3c7034f6bf9fa506d23b1183b # v2
+        uses: github/codeql-action/init@a3a6c128d771b6b9bdebb1c9d0583ebd2728a108 # v2
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2f58583a1b24a7d3c7034f6bf9fa506d23b1183b # v2
+        uses: github/codeql-action/analyze@a3a6c128d771b6b9bdebb1c9d0583ebd2728a108 # v2

From bf1513a3e357025ab1cf4cdb4c09f21316b31cfd Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Tue, 24 May 2022 15:40:26 +0800
Subject: [PATCH 03/43] refactor: fix a lot of errors in type-aware linting
 (#7477)

---
 __tests__/validate-package-json.test.ts       |  20 +++---
 .../functions/codesandbox.ts                  |   5 +-
 .../new.docusaurus.io/functions/stackblitz.ts |   5 +-
 packages/create-docusaurus/src/index.ts       |  41 ++++++------
 packages/docusaurus-logger/src/index.ts       |   4 +-
 packages/docusaurus-mdx-loader/src/index.ts   |   2 +-
 packages/docusaurus-mdx-loader/src/loader.ts  |   4 +-
 .../src/remark/headings/index.ts              |   4 +-
 .../src/remark/transformLinks/index.ts        |   5 +-
 .../src/remark/utils/index.ts                 |   2 +-
 .../src/__tests__/index.test.ts               |   8 +--
 .../docusaurus-migrate/src/frontMatter.ts     |   7 +-
 packages/docusaurus-migrate/src/index.ts      |  61 +++++++++---------
 packages/docusaurus-migrate/src/sanitizeMD.ts |   2 +-
 .../src/index.d.ts                            |   2 +-
 .../src/__tests__/writeRedirectFiles.test.ts  |  14 ++--
 .../src/index.ts                              |   2 +-
 .../src/__tests__/feed.test.ts                |   2 +
 .../src/__tests__/index.test.ts               |   2 +-
 .../src/__tests__/translations.test.ts        |   2 +-
 .../src/authors.ts                            |   6 +-
 .../src/blogUtils.ts                          |   4 +-
 .../src/index.ts                              |  10 +--
 .../src/markdownLoader.ts                     |   2 +-
 .../src/options.ts                            |   5 +-
 .../__snapshots__/translations.test.ts.snap   |  60 ++++++++++++-----
 .../src/__tests__/cli.test.ts                 | Bin 11382 -> 11378 bytes
 .../src/__tests__/docs.test.ts                |   2 +-
 .../src/__tests__/index.test.ts               |   4 +-
 .../src/__tests__/options.test.ts             |  10 +--
 .../src/__tests__/translations.test.ts        |   6 +-
 .../src/client/docsClientUtils.ts             |   2 +-
 .../src/client/index.ts                       |   8 ++-
 .../src/index.ts                              |   2 +-
 .../src/markdown/index.ts                     |   2 +-
 .../src/options.ts                            |   2 +-
 .../src/props.ts                              |   2 +-
 .../src/sidebars/__tests__/generator.test.ts  |   4 +-
 .../src/sidebars/__tests__/processor.test.ts  |   4 +-
 .../src/sidebars/__tests__/utils.test.ts      |  20 +++---
 .../src/sidebars/__tests__/validation.test.ts |  16 ++---
 .../src/sidebars/generator.ts                 |   2 +-
 .../src/sidebars/postProcessor.ts             |   2 +-
 .../src/sidebars/types.ts                     |   4 +-
 .../src/sidebars/utils.ts                     |   2 +-
 .../src/sidebars/validation.ts                |   8 ++-
 .../src/slug.ts                               |   2 +-
 .../src/versions/__tests__/index.test.ts      |   2 +-
 .../src/versions/validation.ts                |   4 +-
 .../src/__tests__/index.test.ts               |   4 +-
 .../src/index.ts                              |   4 +-
 .../src/markdownLoader.ts                     |   2 +-
 .../src/options.ts                            |   2 +-
 .../src/theme/DebugSiteMetadata/index.tsx     |   2 +-
 .../src/index.ts                              |   2 +-
 .../src/index.ts                              |   2 +-
 .../src/theme/IdealImage/index.tsx            |   8 +--
 packages/docusaurus-plugin-pwa/src/index.ts   |   8 +--
 packages/docusaurus-plugin-pwa/src/options.ts |   4 +-
 .../docusaurus-plugin-pwa/src/registerSw.ts   |   6 +-
 .../docusaurus-plugin-sitemap/src/options.ts  |   3 +-
 .../src/index.ts                              |   4 +-
 .../docusaurus-theme-classic/src/index.ts     |   2 +-
 .../src/theme-classic.d.ts                    |   4 +-
 .../src/theme/CodeBlock/Content/String.tsx    |   2 +-
 .../src/theme/DocSidebarItem/Html/index.tsx   |   2 +-
 .../theme/Footer/Links/MultiColumn/index.tsx  |   2 +-
 .../src/components/Collapsible/index.tsx      |   2 +-
 .../src/hooks/useSkipToContent.ts             |   2 +-
 .../src/hooks/useTOCHighlight.ts              |   7 +-
 .../src/utils/codeBlockUtils.ts               |   4 +-
 .../src/utils/reactUtils.tsx                  |   2 +-
 .../src/utils/routesUtils.ts                  |   2 +-
 .../src/utils/scrollUtils.tsx                 |   6 +-
 .../src/utils/searchUtils.ts                  |   2 +-
 .../src/utils/tocUtils.ts                     |   2 +-
 .../src/utils/usePluralForm.ts                |   6 +-
 .../src/validateThemeConfig.ts                |   2 +-
 .../src/index.ts                              |   2 +-
 .../src/validateThemeConfig.ts                |   2 +-
 .../src/index.ts                              |   4 +-
 .../src/JoiFrontMatter.ts                     |   2 +-
 packages/docusaurus-utils/src/pathUtils.ts    |   2 +-
 packages/docusaurus-utils/src/urlUtils.ts     |   6 +-
 packages/docusaurus/src/client/docusaurus.ts  |   2 +-
 .../src/client/exports/useBaseUrl.ts          |   2 +-
 packages/docusaurus/src/commands/serve.ts     |   2 +-
 .../commands/swizzle/__tests__/config.test.ts |  12 ++--
 .../src/commands/swizzle/actions.ts           |   2 +-
 .../docusaurus/src/commands/swizzle/config.ts |  10 ++-
 .../docusaurus/src/commands/swizzle/themes.ts |  10 ++-
 .../src/commands/writeHeadingIds.ts           |   4 +-
 packages/docusaurus/src/deps.d.ts             |   4 +-
 .../docusaurus/src/server/plugins/configs.ts  |   4 +-
 .../docusaurus/src/server/plugins/index.ts    |   2 +-
 .../docusaurus/src/server/plugins/init.ts     |   6 +-
 .../src/server/plugins/moduleShorthand.ts     |   5 +-
 .../src/server/plugins/routeConfig.ts         |   4 +-
 .../src/server/plugins/synthetic.ts           |   2 +-
 packages/docusaurus/src/server/routes.ts      |   2 +-
 .../translations/translationsExtractor.ts     |   6 +-
 packages/docusaurus/src/webpack/base.ts       |   2 +-
 .../src/webpack/plugins/CleanWebpackPlugin.ts |  13 ++--
 packages/docusaurus/src/webpack/utils.ts      |  14 ++--
 packages/lqip-loader/src/index.ts             |   4 +-
 packages/stylelint-copyright/src/index.ts     |   5 +-
 website/_dogfooding/docs-tests-sidebars.js    |  26 ++++++--
 .../_dogfooding/testSwizzleThemeClassic.mjs   |  13 ++--
 website/delayCrowdin.mjs                      |   3 +
 website/docusaurus.config.js                  |   2 +-
 website/src/components/APITable/index.tsx     |   4 +-
 .../src/components/ColorGenerator/index.tsx   |   4 +-
 .../src/components/TeamProfileCards/index.tsx |   4 +-
 website/src/pages/index.tsx                   |   2 +-
 .../ShowcaseFilterToggle/index.tsx            |   2 +-
 .../_components/ShowcaseTooltip/index.tsx     |   6 +-
 website/src/pages/versions.tsx                |  61 +++++++++---------
 website/src/theme/ColorModeToggle.tsx         |   4 +-
 website/testCSSOrder.mjs                      |  11 +++-
 website/waitForCrowdin.mjs                    |   3 +
 120 files changed, 407 insertions(+), 364 deletions(-)

diff --git a/__tests__/validate-package-json.test.ts b/__tests__/validate-package-json.test.ts
index ef18176ecd92..b8dd9b78771e 100644
--- a/__tests__/validate-package-json.test.ts
+++ b/__tests__/validate-package-json.test.ts
@@ -70,17 +70,15 @@ describe('packages', () => {
         packageJsonFile.content.name?.startsWith('@'),
       )
       .forEach((packageJsonFile) => {
-        if (packageJsonFile) {
-          // Unfortunately jest custom message do not exist in loops,
-          // so using an exception instead to show failing package file
-          // (see https://github.com/facebook/jest/issues/3293)
-          // expect(packageJsonFile.content.publishConfig?.access)
-          //  .toEqual('public');
-          if (packageJsonFile.content.publishConfig?.access !== 'public') {
-            throw new Error(
-              `Package ${packageJsonFile.file} does not have publishConfig.access: 'public'`,
-            );
-          }
+        // Unfortunately jest custom message do not exist in loops,
+        // so using an exception instead to show failing package file
+        // (see https://github.com/facebook/jest/issues/3293)
+        // expect(packageJsonFile.content.publishConfig?.access)
+        //  .toEqual('public');
+        if (packageJsonFile.content.publishConfig?.access !== 'public') {
+          throw new Error(
+            `Package ${packageJsonFile.file} does not have publishConfig.access: 'public'`,
+          );
         }
       });
   });
diff --git a/admin/new.docusaurus.io/functions/codesandbox.ts b/admin/new.docusaurus.io/functions/codesandbox.ts
index 650c45727e6b..6f7b8327decf 100644
--- a/admin/new.docusaurus.io/functions/codesandbox.ts
+++ b/admin/new.docusaurus.io/functions/codesandbox.ts
@@ -8,6 +8,5 @@
 import {createPlaygroundResponse} from '../functionUtils/playgroundUtils';
 import type {Handler} from '@netlify/functions';
 
-export const handler: Handler = async function handler() {
-  return createPlaygroundResponse('codesandbox');
-};
+export const handler: Handler = () =>
+  Promise.resolve(createPlaygroundResponse('codesandbox'));
diff --git a/admin/new.docusaurus.io/functions/stackblitz.ts b/admin/new.docusaurus.io/functions/stackblitz.ts
index bc6a84d31f5a..6e69c2ade829 100644
--- a/admin/new.docusaurus.io/functions/stackblitz.ts
+++ b/admin/new.docusaurus.io/functions/stackblitz.ts
@@ -8,6 +8,5 @@
 import {createPlaygroundResponse} from '../functionUtils/playgroundUtils';
 import type {Handler} from '@netlify/functions';
 
-export const handler: Handler = async function handler() {
-  return createPlaygroundResponse('stackblitz');
-};
+export const handler: Handler = () =>
+  Promise.resolve(createPlaygroundResponse('stackblitz'));
diff --git a/packages/create-docusaurus/src/index.ts b/packages/create-docusaurus/src/index.ts
index c1f592cefcd1..6523b9291766 100755
--- a/packages/create-docusaurus/src/index.ts
+++ b/packages/create-docusaurus/src/index.ts
@@ -65,20 +65,22 @@ async function askForPackageManagerChoice(): Promise<PackageManager> {
     .map((p) => ({title: p, value: p}));
 
   return (
-    (await prompts(
-      {
-        type: 'select',
-        name: 'packageManager',
-        message: 'Select a package manager...',
-        choices,
-      },
-      {
-        onCancel() {
-          logger.info`Falling back to name=${defaultPackageManager}`;
+    (
+      (await prompts(
+        {
+          type: 'select',
+          name: 'packageManager',
+          message: 'Select a package manager...',
+          choices,
         },
-      },
-    )) as {packageManager: PackageManager}
-  ).packageManager;
+        {
+          onCancel() {
+            logger.info`Falling back to name=${defaultPackageManager}`;
+          },
+        },
+      )) as {packageManager: PackageManager}
+    ).packageManager ?? defaultPackageManager
+  );
 }
 
 async function getPackageManager(
@@ -101,8 +103,7 @@ async function getPackageManager(
     (await findPackageManagerFromLockFile('.')) ??
     findPackageManagerFromUserAgent() ??
     // This only happens if the user has a global installation in PATH
-    (skipInstall ? defaultPackageManager : askForPackageManagerChoice()) ??
-    defaultPackageManager
+    (skipInstall ? defaultPackageManager : askForPackageManagerChoice())
   );
 }
 
@@ -215,7 +216,7 @@ async function getGitCommand(gitStrategy: GitStrategy): Promise<string> {
             logger.info`Falling back to code=${'git clone'}`;
           },
         },
-      )) as {command: string};
+      )) as {command?: string};
       return command ?? 'git clone';
     }
     case 'deep':
@@ -362,7 +363,7 @@ async function getSource(
     )) as {gitRepoUrl: string};
     let strategy = cliOptions.gitStrategy;
     if (!strategy) {
-      ({strategy} = await prompts(
+      ({strategy} = (await prompts(
         {
           type: 'select',
           name: 'strategy',
@@ -385,7 +386,7 @@ async function getSource(
             logger.info`Falling back to name=${'deep'}`;
           },
         },
-      ));
+      )) as {strategy?: GitStrategy});
     }
     return {
       type: 'git',
@@ -426,13 +427,13 @@ async function getSource(
   }
   let useTS = cliOptions.typescript;
   if (!useTS && template.tsVariantPath) {
-    ({useTS} = await prompts({
+    ({useTS} = (await prompts({
       type: 'confirm',
       name: 'useTS',
       message:
         'This template is available in TypeScript. Do you want to use the TS variant?',
       initial: false,
-    }));
+    })) as {useTS?: boolean});
   }
   return {
     type: 'template',
diff --git a/packages/docusaurus-logger/src/index.ts b/packages/docusaurus-logger/src/index.ts
index 6db95cdd1531..768cb8f9a0c2 100644
--- a/packages/docusaurus-logger/src/index.ts
+++ b/packages/docusaurus-logger/src/index.ts
@@ -9,10 +9,10 @@ import chalk from 'chalk';
 
 type InterpolatableValue = string | number | (string | number)[];
 
-const path = (msg: unknown): string => chalk.cyan.underline(`"${msg}"`);
+const path = (msg: unknown): string => chalk.cyan.underline(`"${String(msg)}"`);
 const url = (msg: unknown): string => chalk.cyan.underline(msg);
 const name = (msg: unknown): string => chalk.blue.bold(msg);
-const code = (msg: unknown): string => chalk.cyan(`\`${msg}\``);
+const code = (msg: unknown): string => chalk.cyan(`\`${String(msg)}\``);
 const subdue = (msg: unknown): string => chalk.gray(msg);
 const num = (msg: unknown): string => chalk.yellow(msg);
 
diff --git a/packages/docusaurus-mdx-loader/src/index.ts b/packages/docusaurus-mdx-loader/src/index.ts
index ad7887dcc77c..1b7f2be72344 100644
--- a/packages/docusaurus-mdx-loader/src/index.ts
+++ b/packages/docusaurus-mdx-loader/src/index.ts
@@ -21,7 +21,7 @@ export type LoadedMDXContent<FrontMatter, Metadata, Assets = undefined> = {
   /** As provided by the content plugin. */
   readonly metadata: Metadata;
   /** A list of TOC items (headings). */
-  readonly toc: readonly TOCItem[];
+  readonly toc?: readonly TOCItem[];
   /** First h1 title before any content. */
   readonly contentTitle: string | undefined;
   /**
diff --git a/packages/docusaurus-mdx-loader/src/loader.ts b/packages/docusaurus-mdx-loader/src/loader.ts
index 88fa1ecd5bdc..638a62566724 100644
--- a/packages/docusaurus-mdx-loader/src/loader.ts
+++ b/packages/docusaurus-mdx-loader/src/loader.ts
@@ -55,7 +55,7 @@ export type MDXOptions = {
   beforeDefaultRehypePlugins: MDXPlugin[];
 };
 
-export type Options = MDXOptions & {
+export type Options = Partial<MDXOptions> & {
   staticDirs: string[];
   siteDir: string;
   isMDXPartial?: (filePath: string) => boolean;
@@ -138,7 +138,7 @@ export async function mdxLoader(
 ): Promise<void> {
   const callback = this.async();
   const filePath = this.resourcePath;
-  const reqOptions = this.getOptions() ?? {};
+  const reqOptions = this.getOptions();
 
   const {frontMatter, content: contentWithTitle} = parseFrontMatter(fileString);
 
diff --git a/packages/docusaurus-mdx-loader/src/remark/headings/index.ts b/packages/docusaurus-mdx-loader/src/remark/headings/index.ts
index 51b0cb6c7bbd..98aaa37f7552 100644
--- a/packages/docusaurus-mdx-loader/src/remark/headings/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/headings/index.ts
@@ -17,7 +17,7 @@ export default function plugin(): Transformer {
   return (root) => {
     const slugs = createSlugger();
     visit(root, 'heading', (headingNode: Heading) => {
-      const data = headingNode.data || (headingNode.data = {});
+      const data = headingNode.data ?? (headingNode.data = {});
       const properties = (data.hProperties || (data.hProperties = {})) as {
         id: string;
       };
@@ -36,7 +36,7 @@ export default function plugin(): Transformer {
         // Support explicit heading IDs
         const parsedHeading = parseMarkdownHeadingId(heading);
 
-        id = parsedHeading.id || slugs.slug(heading);
+        id = parsedHeading.id ?? slugs.slug(heading);
 
         if (parsedHeading.id) {
           // When there's an id, it is always in the last child node
diff --git a/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts b/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts
index 9c9f2004ba7d..59e1b4117bf5 100644
--- a/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts
@@ -110,8 +110,9 @@ async function processLinkNode(node: Link, context: Context) {
   if (!node.url) {
     // Try to improve error feedback
     // see https://github.com/facebook/docusaurus/issues/3309#issuecomment-690371675
-    const title = node.title || (node.children[0] as Literal)?.value || '?';
-    const line = node?.position?.start?.line || '?';
+    const title =
+      node.title ?? (node.children[0] as Literal | undefined)?.value ?? '?';
+    const line = node.position?.start.line ?? '?';
     throw new Error(
       `Markdown link URL is mandatory in "${toMessageRelativeFilePath(
         context.filePath,
diff --git a/packages/docusaurus-mdx-loader/src/remark/utils/index.ts b/packages/docusaurus-mdx-loader/src/remark/utils/index.ts
index b0314d7a2349..3bf275085bf5 100644
--- a/packages/docusaurus-mdx-loader/src/remark/utils/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/utils/index.ts
@@ -15,7 +15,7 @@ export function stringifyContent(node: Parent): string {
 }
 
 export function toValue(node: PhrasingContent | Heading): string {
-  switch (node?.type) {
+  switch (node.type) {
     case 'text':
       return escapeHtml(node.value);
     case 'heading':
diff --git a/packages/docusaurus-migrate/src/__tests__/index.test.ts b/packages/docusaurus-migrate/src/__tests__/index.test.ts
index 8eea0cd15849..306f7e394a12 100644
--- a/packages/docusaurus-migrate/src/__tests__/index.test.ts
+++ b/packages/docusaurus-migrate/src/__tests__/index.test.ts
@@ -19,22 +19,22 @@ async function testMigration(siteDir: string, newDir: string) {
   await migrateDocusaurusProject(siteDir, newDir, true, true);
   expect(
     writeMock.mock.calls.sort((a, b) =>
-      posixPath(a[0] as string).localeCompare(posixPath(b[0] as string)),
+      posixPath(a[0]).localeCompare(posixPath(b[0])),
     ),
   ).toMatchSnapshot('write');
   expect(
     mkdirpMock.mock.calls.sort((a, b) =>
-      posixPath(a[0] as string).localeCompare(posixPath(b[0] as string)),
+      posixPath(a[0]).localeCompare(posixPath(b[0])),
     ),
   ).toMatchSnapshot('mkdirp');
   expect(
     mkdirsMock.mock.calls.sort((a, b) =>
-      posixPath(a[0] as string).localeCompare(posixPath(b[0] as string)),
+      posixPath(a[0]).localeCompare(posixPath(b[0])),
     ),
   ).toMatchSnapshot('mkdirs');
   expect(
     copyMock.mock.calls.sort((a, b) =>
-      posixPath(a[0] as string).localeCompare(posixPath(b[0] as string)),
+      posixPath(a[0]).localeCompare(posixPath(b[0])),
     ),
   ).toMatchSnapshot('copy');
   writeMock.mockRestore();
diff --git a/packages/docusaurus-migrate/src/frontMatter.ts b/packages/docusaurus-migrate/src/frontMatter.ts
index 2d03fb0e40e5..6ec040296d74 100644
--- a/packages/docusaurus-migrate/src/frontMatter.ts
+++ b/packages/docusaurus-migrate/src/frontMatter.ts
@@ -40,12 +40,7 @@ export default function extractMetadata(content: string): Data {
   lines.slice(0, -1).forEach((line) => {
     const keyValue = line.split(':') as [string, ...string[]];
     const key = keyValue[0].trim();
-    let value = keyValue.slice(1).join(':').trim();
-    try {
-      value = JSON.parse(value);
-    } catch (err) {
-      // Ignore the error as it means it's not a JSON value.
-    }
+    const value = keyValue.slice(1).join(':').trim();
     metadata[key] = value;
   });
   return {metadata, rawContent: both.content};
diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts
index 81f31e6b874c..165c7c2fd32f 100644
--- a/packages/docusaurus-migrate/src/index.ts
+++ b/packages/docusaurus-migrate/src/index.ts
@@ -474,7 +474,7 @@ async function migrateVersionedDocs(
     versions.reverse().map(async (version, index) => {
       if (index === 0) {
         await fs.copy(
-          path.join(siteDir, '..', context.v1Config.customDocsPath || 'docs'),
+          path.join(siteDir, '..', context.v1Config.customDocsPath ?? 'docs'),
           path.join(newDir, 'versioned_docs', `version-${version}`),
         );
         await fs.copy(
@@ -551,7 +551,9 @@ async function migrateVersionedSidebar(
       const newSidebar = Object.entries(sidebarEntries).reduce(
         (topLevel: SidebarEntries, value) => {
           const key = value[0].replace(versionRegex, '');
-          topLevel[key] = Object.entries(value[1]).reduce((acc, val) => {
+          topLevel[key] = Object.entries(value[1]).reduce<{
+            [key: string]: Array<string | {[key: string]: unknown}>;
+          }>((acc, val) => {
             acc[val[0].replace(versionRegex, '')] = (
               val[1] as SidebarEntry[]
             ).map((item) => {
@@ -565,7 +567,7 @@ async function migrateVersionedSidebar(
               };
             });
             return acc;
-          }, {} as {[key: string]: Array<string | {[key: string]: unknown}>});
+          }, {});
           return topLevel;
         },
         {},
@@ -574,33 +576,32 @@ async function migrateVersionedSidebar(
     }
     await Promise.all(
       sidebars.map(async (sidebar) => {
-        const newSidebar = Object.entries(sidebar.entries).reduce(
-          (acc, val) => {
-            const key = `version-${sidebar.version}/${val[0]}`;
-            acc[key] = Object.entries(val[1]).map((value) => ({
-              type: 'category',
-              label: value[0],
-              items: (value[1] as SidebarEntry[]).map((sidebarItem) => {
-                if (typeof sidebarItem === 'string') {
-                  return {
-                    type: 'doc',
-                    id: `version-${sidebar.version}/${sidebarItem}`,
-                  };
-                }
+        const newSidebar = Object.entries(
+          sidebar.entries,
+        ).reduce<SidebarEntries>((acc, val) => {
+          const key = `version-${sidebar.version}/${val[0]}`;
+          acc[key] = Object.entries(val[1]).map((value) => ({
+            type: 'category',
+            label: value[0],
+            items: (value[1] as SidebarEntry[]).map((sidebarItem) => {
+              if (typeof sidebarItem === 'string') {
                 return {
-                  type: 'category',
-                  label: sidebarItem.label,
-                  items: sidebarItem.ids.map((id) => ({
-                    type: 'doc',
-                    id: `version-${sidebar.version}/${id}`,
-                  })),
+                  type: 'doc',
+                  id: `version-${sidebar.version}/${sidebarItem}`,
                 };
-              }),
-            }));
-            return acc;
-          },
-          {} as SidebarEntries,
-        );
+              }
+              return {
+                type: 'category',
+                label: sidebarItem.label,
+                items: sidebarItem.ids.map((id) => ({
+                  type: 'doc',
+                  id: `version-${sidebar.version}/${id}`,
+                })),
+              };
+            }),
+          }));
+          return acc;
+        }, {});
         await fs.outputFile(
           path.join(
             newDir,
@@ -702,12 +703,12 @@ async function migrateLatestDocs(context: MigrationContext) {
 
 async function migratePackageFile(context: MigrationContext): Promise<void> {
   const {deps, siteDir, newDir} = context;
-  const packageFile = importFresh(`${siteDir}/package.json`) as {
+  const packageFile = importFresh<{
     scripts?: {[key: string]: string};
     dependencies?: {[key: string]: string};
     devDependencies?: {[key: string]: string};
     [otherKey: string]: unknown;
-  };
+  }>(`${siteDir}/package.json`);
   packageFile.scripts = {
     ...packageFile.scripts,
     start: 'docusaurus start',
diff --git a/packages/docusaurus-migrate/src/sanitizeMD.ts b/packages/docusaurus-migrate/src/sanitizeMD.ts
index 55bd803aea51..61e3904cb0aa 100644
--- a/packages/docusaurus-migrate/src/sanitizeMD.ts
+++ b/packages/docusaurus-migrate/src/sanitizeMD.ts
@@ -37,7 +37,7 @@ export default function sanitizeMD(code: string): string {
   const htmlTree = unified().use(parse).parse(markdownString);
 
   visit(htmlTree, 'element', (node: Element) => {
-    if (!tags[node.tagName as string]) {
+    if (!tags[node.tagName]) {
       (node as Element | Text).type = 'text';
       (node as Element & Partial<Omit<Text, 'type'>>).value =
         node.tagName + toText(node);
diff --git a/packages/docusaurus-module-type-aliases/src/index.d.ts b/packages/docusaurus-module-type-aliases/src/index.d.ts
index ccb4bf5706fc..cd6bf0d1c910 100644
--- a/packages/docusaurus-module-type-aliases/src/index.d.ts
+++ b/packages/docusaurus-module-type-aliases/src/index.d.ts
@@ -8,7 +8,7 @@
 declare module '@generated/client-modules' {
   import type {ClientModule} from '@docusaurus/types';
 
-  const clientModules: readonly (ClientModule & {default: ClientModule})[];
+  const clientModules: readonly (ClientModule & {default?: ClientModule})[];
   export default clientModules;
 }
 
diff --git a/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts b/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts
index 739c2f6a99b5..2ed5d2f1a1b1 100644
--- a/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts
@@ -17,7 +17,7 @@ import writeRedirectFiles, {
 // - https://github.com/facebook/docusaurus/issues/3886
 // - https://github.com/facebook/docusaurus/issues/3925
 describe('createToUrl', () => {
-  it('creates appropriate redirect urls', async () => {
+  it('creates appropriate redirect urls', () => {
     expect(createToUrl('/', '/docs/something/else')).toBe(
       '/docs/something/else',
     );
@@ -29,7 +29,7 @@ describe('createToUrl', () => {
     );
   });
 
-  it('creates appropriate redirect urls with baseUrl', async () => {
+  it('creates appropriate redirect urls with baseUrl', () => {
     expect(createToUrl('/baseUrl/', '/docs/something/else')).toBe(
       '/baseUrl/docs/something/else',
     );
@@ -43,7 +43,7 @@ describe('createToUrl', () => {
 });
 
 describe('toRedirectFilesMetadata', () => {
-  it('creates appropriate metadata trailingSlash=undefined', async () => {
+  it('creates appropriate metadata trailingSlash=undefined', () => {
     const pluginContext = {
       outDir: '/tmp/someFixedOutDir',
       baseUrl: 'https://docusaurus.io',
@@ -70,7 +70,7 @@ describe('toRedirectFilesMetadata', () => {
     );
   });
 
-  it('creates appropriate metadata trailingSlash=true', async () => {
+  it('creates appropriate metadata trailingSlash=true', () => {
     const pluginContext = {
       outDir: '/tmp/someFixedOutDir',
       baseUrl: 'https://docusaurus.io',
@@ -97,7 +97,7 @@ describe('toRedirectFilesMetadata', () => {
     );
   });
 
-  it('creates appropriate metadata trailingSlash=false', async () => {
+  it('creates appropriate metadata trailingSlash=false', () => {
     const pluginContext = {
       outDir: '/tmp/someFixedOutDir',
       baseUrl: 'https://docusaurus.io',
@@ -127,7 +127,7 @@ describe('toRedirectFilesMetadata', () => {
     );
   });
 
-  it('creates appropriate metadata for root baseUrl', async () => {
+  it('creates appropriate metadata for root baseUrl', () => {
     const pluginContext = {
       outDir: '/tmp/someFixedOutDir',
       baseUrl: '/',
@@ -142,7 +142,7 @@ describe('toRedirectFilesMetadata', () => {
     );
   });
 
-  it('creates appropriate metadata for empty baseUrl', async () => {
+  it('creates appropriate metadata for empty baseUrl', () => {
     const pluginContext = {
       outDir: '/tmp/someFixedOutDir',
       baseUrl: '',
diff --git a/packages/docusaurus-plugin-client-redirects/src/index.ts b/packages/docusaurus-plugin-client-redirects/src/index.ts
index 78d117c7ca28..237f3f099e9e 100644
--- a/packages/docusaurus-plugin-client-redirects/src/index.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/index.ts
@@ -18,7 +18,7 @@ import type {PluginOptions, Options} from './options';
 export default function pluginClientRedirectsPages(
   context: LoadContext,
   options: PluginOptions,
-): Plugin<unknown> {
+): Plugin<void> {
   const {trailingSlash} = context.siteConfig;
 
   return {
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
index 48c3395f728b..7b7981985443 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
@@ -89,6 +89,7 @@ describe.each(['atom', 'rss', 'json'])('%s', (feedType) => {
         },
         readingTime: ({content, defaultReadingTime}) =>
           defaultReadingTime({content}),
+        truncateMarker: /<!--\s*truncate\s*-->/,
       } as PluginOptions,
     );
 
@@ -128,6 +129,7 @@ describe.each(['atom', 'rss', 'json'])('%s', (feedType) => {
         },
         readingTime: ({content, defaultReadingTime}) =>
           defaultReadingTime({content}),
+        truncateMarker: /<!--\s*truncate\s*-->/,
       } as PluginOptions,
     );
 
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
index 11b33cd2a183..384b7014c7ea 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
@@ -76,7 +76,7 @@ const getPlugin = async (
         editUrl: BaseEditUrl,
         ...pluginOptions,
       },
-    }) as PluginOptions,
+    }),
   );
 };
 
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
index 62442bbf8151..a29ae6e3acb7 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
@@ -74,7 +74,7 @@ function getSampleTranslationFilesTranslated() {
 }
 
 describe('getContentTranslationFiles', () => {
-  it('returns translation files matching snapshot', async () => {
+  it('returns translation files matching snapshot', () => {
     expect(getSampleTranslationFiles()).toMatchSnapshot();
   });
 });
diff --git a/packages/docusaurus-plugin-content-blog/src/authors.ts b/packages/docusaurus-plugin-content-blog/src/authors.ts
index cf3bbe5c8522..4d8f7b90b3fb 100644
--- a/packages/docusaurus-plugin-content-blog/src/authors.ts
+++ b/packages/docusaurus-plugin-content-blog/src/authors.ts
@@ -44,7 +44,11 @@ const AuthorsMapSchema = Joi.object<AuthorsMap>()
   });
 
 export function validateAuthorsMap(content: unknown): AuthorsMap {
-  return Joi.attempt(content, AuthorsMapSchema);
+  const {error, value} = AuthorsMapSchema.validate(content);
+  if (error) {
+    throw error;
+  }
+  return value;
 }
 
 export async function getAuthorsMap(params: {
diff --git a/packages/docusaurus-plugin-content-blog/src/blogUtils.ts b/packages/docusaurus-plugin-content-blog/src/blogUtils.ts
index 370ddeb50aa3..ee6742c7bff5 100644
--- a/packages/docusaurus-plugin-content-blog/src/blogUtils.ts
+++ b/packages/docusaurus-plugin-content-blog/src/blogUtils.ts
@@ -264,7 +264,7 @@ async function processBlogSourceFile(
   const title = frontMatter.title ?? contentTitle ?? parsedBlogFileName.text;
   const description = frontMatter.description ?? excerpt ?? '';
 
-  const slug = frontMatter.slug || parsedBlogFileName.slug;
+  const slug = frontMatter.slug ?? parsedBlogFileName.slug;
 
   const permalink = normalizeUrl([baseUrl, routeBasePath, slug]);
 
@@ -323,7 +323,7 @@ async function processBlogSourceFile(
             defaultReadingTime,
           })
         : undefined,
-      truncated: truncateMarker?.test(content) || false,
+      truncated: truncateMarker.test(content),
       authors,
       frontMatter,
     },
diff --git a/packages/docusaurus-plugin-content-blog/src/index.ts b/packages/docusaurus-plugin-content-blog/src/index.ts
index a3dddc2404f5..2b0355a0f3f1 100644
--- a/packages/docusaurus-plugin-content-blog/src/index.ts
+++ b/packages/docusaurus-plugin-content-blog/src/index.ts
@@ -176,10 +176,6 @@ export default async function pluginContentBlog(
     },
 
     async contentLoaded({content: blogContents, actions}) {
-      if (!blogContents) {
-        return;
-      }
-
       const {
         blogListComponent,
         blogPostComponent,
@@ -500,11 +496,7 @@ export default async function pluginContentBlog(
     },
 
     injectHtmlTags({content}) {
-      if (!content.blogPosts.length) {
-        return {};
-      }
-
-      if (!options.feedOptions?.type) {
+      if (!content.blogPosts.length || !options.feedOptions.type) {
         return {};
       }
 
diff --git a/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts b/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts
index a5f3d4929889..add3e16682c2 100644
--- a/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts
+++ b/packages/docusaurus-plugin-content-blog/src/markdownLoader.ts
@@ -34,5 +34,5 @@ export default function markdownLoader(
     finalContent = truncate(finalContent, markdownLoaderOptions.truncateMarker);
   }
 
-  return callback?.(null, finalContent);
+  return callback(null, finalContent);
 }
diff --git a/packages/docusaurus-plugin-content-blog/src/options.ts b/packages/docusaurus-plugin-content-blog/src/options.ts
index f6fa74e726bc..ff06c867dc9d 100644
--- a/packages/docusaurus-plugin-content-blog/src/options.ts
+++ b/packages/docusaurus-plugin-content-blog/src/options.ts
@@ -136,9 +136,6 @@ export function validateOptions({
   validate,
   options,
 }: OptionValidationContext<Options, PluginOptions>): PluginOptions {
-  const validatedOptions = validate(
-    PluginOptionSchema,
-    options,
-  ) as PluginOptions;
+  const validatedOptions = validate(PluginOptionSchema, options);
   return validatedOptions;
 }
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap
index a67e0081748c..b952835b06d0 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap
@@ -90,13 +90,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc1 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc1 title",
+          },
           "id": "doc1",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc1 title",
           "slug": "any",
           "source": "any",
           "title": "doc1 title",
@@ -106,13 +108,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc2 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc2 title",
+          },
           "id": "doc2",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc2 title",
           "slug": "any",
           "source": "any",
           "title": "doc2 title",
@@ -122,13 +126,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc3 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc3 title",
+          },
           "id": "doc3",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc3 title",
           "slug": "any",
           "source": "any",
           "title": "doc3 title",
@@ -138,13 +144,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc4 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc4 title",
+          },
           "id": "doc4",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc4 title",
           "slug": "any",
           "source": "any",
           "title": "doc4 title",
@@ -154,13 +162,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc5 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc5 title",
+          },
           "id": "doc5",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc5 title",
           "slug": "any",
           "source": "any",
           "title": "doc5 title",
@@ -232,13 +242,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc1 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc1 title",
+          },
           "id": "doc1",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc1 title",
           "slug": "any",
           "source": "any",
           "title": "doc1 title",
@@ -248,13 +260,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc2 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc2 title",
+          },
           "id": "doc2",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc2 title",
           "slug": "any",
           "source": "any",
           "title": "doc2 title",
@@ -264,13 +278,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc3 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc3 title",
+          },
           "id": "doc3",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc3 title",
           "slug": "any",
           "source": "any",
           "title": "doc3 title",
@@ -280,13 +296,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc4 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc4 title",
+          },
           "id": "doc4",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc4 title",
           "slug": "any",
           "source": "any",
           "title": "doc4 title",
@@ -296,13 +314,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc5 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc5 title",
+          },
           "id": "doc5",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc5 title",
           "slug": "any",
           "source": "any",
           "title": "doc5 title",
@@ -374,13 +394,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc1 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc1 title",
+          },
           "id": "doc1",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc1 title",
           "slug": "any",
           "source": "any",
           "title": "doc1 title",
@@ -390,13 +412,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc2 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc2 title",
+          },
           "id": "doc2",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc2 title",
           "slug": "any",
           "source": "any",
           "title": "doc2 title",
@@ -406,13 +430,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc3 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc3 title",
+          },
           "id": "doc3",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc3 title",
           "slug": "any",
           "source": "any",
           "title": "doc3 title",
@@ -422,13 +448,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc4 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc4 title",
+          },
           "id": "doc4",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc4 title",
           "slug": "any",
           "source": "any",
           "title": "doc4 title",
@@ -438,13 +466,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         {
           "description": "doc5 description",
           "editUrl": "any",
+          "frontMatter": {
+            "sidebar_label": "doc5 title",
+          },
           "id": "doc5",
           "lastUpdatedAt": 0,
           "lastUpdatedBy": "any",
           "next": undefined,
           "permalink": "any",
           "previous": undefined,
-          "sidebar_label": "doc5 title",
           "slug": "any",
           "source": "any",
           "title": "doc5 title",
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/cli.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/cli.test.ts
index bb1f1c70a0717b59c9490a839032b75983303d2b..55c50ab0cddf930ca37a38e3b431cfad218d6b70 100644
GIT binary patch
delta 35
rcmews@hM`%4i=WY(wv;d`&bw`OY>4v(=zi?QzqZzci7Cyma7H;7HSRp

delta 43
xcmewq@hxJ*4i+}0ywaQ;rOD^`>?i+bImoS4nwOHAmYJ8D0upoB%*vLl1^}6d5extT

diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
index 3e0f09010925..9a338c5bf9d2 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
@@ -119,7 +119,7 @@ function createTestUtils({
 
   async function testSlug(docFileSource: string, expectedPermalink: string) {
     const docFile = await readDoc(docFileSource);
-    const metadata = await processDocMetadata({
+    const metadata = processDocMetadata({
       docFile,
       versionMetadata,
       context,
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 0d54d4bc1308..fd25cc85eef9 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -54,9 +54,9 @@ const createFakeActions = (contentDir: string) => {
     addRoute: (config: RouteConfig) => {
       routeConfigs.push(config);
     },
-    createData: async (name: string, content: unknown) => {
+    createData: (name: string, content: unknown) => {
       dataContainer[name] = content;
-      return path.join(contentDir, name);
+      return Promise.resolve(path.join(contentDir, name));
     },
     setGlobalData: (data: unknown) => {
       globalDataContainer.pluginName = {pluginId: data};
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
index bcbaccfe1144..a3ddd11f843d 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
@@ -31,11 +31,11 @@ const defaultOptions = {
 };
 
 describe('normalizeDocsPluginOptions', () => {
-  it('returns default options for undefined user options', async () => {
+  it('returns default options for undefined user options', () => {
     expect(testValidate({})).toEqual(defaultOptions);
   });
 
-  it('accepts correctly defined user options', async () => {
+  it('accepts correctly defined user options', () => {
     const userOptions = {
       path: 'my-docs', // Path to data on filesystem, relative to site dir.
       routeBasePath: 'my-docs', // URL Route.
@@ -83,7 +83,7 @@ describe('normalizeDocsPluginOptions', () => {
     });
   });
 
-  it('accepts correctly defined remark and rehype plugin options', async () => {
+  it('accepts correctly defined remark and rehype plugin options', () => {
     const userOptions = {
       beforeDefaultRemarkPlugins: [],
       beforeDefaultRehypePlugins: [markdownPluginsFunctionStub],
@@ -100,7 +100,7 @@ describe('normalizeDocsPluginOptions', () => {
     });
   });
 
-  it('accepts admonitions false', async () => {
+  it('accepts admonitions false', () => {
     const admonitionsFalse = {
       admonitions: false,
     };
@@ -110,7 +110,7 @@ describe('normalizeDocsPluginOptions', () => {
     });
   });
 
-  it('rejects admonitions true', async () => {
+  it('rejects admonitions true', () => {
     const admonitionsTrue = {
       admonitions: true,
     };
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
index 5d098e355fb7..a79409ba8d84 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
@@ -30,7 +30,9 @@ function createSampleDoc(doc: Pick<DocMetadata, 'id'>): DocMetadata {
     unversionedId: 'any',
     version: 'any',
     title: `${doc.id} title`,
-    sidebar_label: `${doc.id} title`,
+    frontMatter: {
+      sidebar_label: `${doc.id} title`,
+    },
     description: `${doc.id} description`,
     ...doc,
   };
@@ -136,7 +138,7 @@ function getSampleTranslationFilesTranslated() {
 }
 
 describe('getLoadedContentTranslationFiles', () => {
-  it('returns translation files', async () => {
+  it('returns translation files', () => {
     expect(getSampleTranslationFiles()).toMatchSnapshot();
   });
 });
diff --git a/packages/docusaurus-plugin-content-docs/src/client/docsClientUtils.ts b/packages/docusaurus-plugin-content-docs/src/client/docsClientUtils.ts
index 752a53d91edc..f3229ac46522 100644
--- a/packages/docusaurus-plugin-content-docs/src/client/docsClientUtils.ts
+++ b/packages/docusaurus-plugin-content-docs/src/client/docsClientUtils.ts
@@ -126,6 +126,6 @@ export function getDocVersionSuggestions(
   const latestVersion = getLatestVersion(data);
   const activeDocContext = getActiveDocContext(data, pathname);
   const latestDocSuggestion: GlobalDoc | undefined =
-    activeDocContext?.alternateDocVersions[latestVersion.name];
+    activeDocContext.alternateDocVersions[latestVersion.name];
   return {latestDocSuggestion, latestVersionSuggestion: latestVersion};
 }
diff --git a/packages/docusaurus-plugin-content-docs/src/client/index.ts b/packages/docusaurus-plugin-content-docs/src/client/index.ts
index 298ed4dcd9c9..bfc2bfd78cb0 100644
--- a/packages/docusaurus-plugin-content-docs/src/client/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/client/index.ts
@@ -34,9 +34,11 @@ const StableEmptyObject = {};
 // In blog-only mode, docs hooks are still used by the theme. We need a fail-
 // safe fallback when the docs plugin is not in use
 export const useAllDocsData = (): {[pluginId: string]: GlobalPluginData} =>
-  (useAllPluginInstancesData('docusaurus-plugin-content-docs') as {
-    [pluginId: string]: GlobalPluginData;
-  }) ?? StableEmptyObject;
+  (useAllPluginInstancesData('docusaurus-plugin-content-docs') as
+    | {
+        [pluginId: string]: GlobalPluginData;
+      }
+    | undefined) ?? StableEmptyObject;
 
 export const useDocsData = (pluginId: string | undefined): GlobalPluginData =>
   usePluginData('docusaurus-plugin-content-docs', pluginId, {
diff --git a/packages/docusaurus-plugin-content-docs/src/index.ts b/packages/docusaurus-plugin-content-docs/src/index.ts
index 982895957382..afbb809fb718 100644
--- a/packages/docusaurus-plugin-content-docs/src/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/index.ts
@@ -143,7 +143,7 @@ export default async function pluginContentDocs(
             )}".`,
           );
         }
-        async function processVersionDoc(docFile: DocFile) {
+        function processVersionDoc(docFile: DocFile) {
           return processDocMetadata({
             docFile,
             versionMetadata,
diff --git a/packages/docusaurus-plugin-content-docs/src/markdown/index.ts b/packages/docusaurus-plugin-content-docs/src/markdown/index.ts
index 5de4aae87f4d..9d846ef8d5c5 100644
--- a/packages/docusaurus-plugin-content-docs/src/markdown/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/markdown/index.ts
@@ -16,5 +16,5 @@ export default function markdownLoader(
   const fileString = source;
   const callback = this.async();
   const options = this.getOptions();
-  return callback?.(null, linkify(fileString, this.resourcePath, options));
+  return callback(null, linkify(fileString, this.resourcePath, options));
 }
diff --git a/packages/docusaurus-plugin-content-docs/src/options.ts b/packages/docusaurus-plugin-content-docs/src/options.ts
index 27b9118a718f..bd1cd5d70732 100644
--- a/packages/docusaurus-plugin-content-docs/src/options.ts
+++ b/packages/docusaurus-plugin-content-docs/src/options.ts
@@ -165,7 +165,7 @@ export function validateOptions({
     }
   }
 
-  const normalizedOptions = validate(OptionsSchema, options) as PluginOptions;
+  const normalizedOptions = validate(OptionsSchema, options);
 
   if (normalizedOptions.admonitions) {
     normalizedOptions.remarkPlugins = normalizedOptions.remarkPlugins.concat([
diff --git a/packages/docusaurus-plugin-content-docs/src/props.ts b/packages/docusaurus-plugin-content-docs/src/props.ts
index 8505d5de2cd2..7d27cebaa9b4 100644
--- a/packages/docusaurus-plugin-content-docs/src/props.ts
+++ b/packages/docusaurus-plugin-content-docs/src/props.ts
@@ -51,7 +51,7 @@ Available document ids are:
     } = docMetadata;
     return {
       type: 'link',
-      label: sidebarLabel || item.label || title,
+      label: sidebarLabel ?? item.label ?? title,
       href: permalink,
       className: item.className,
       customProps:
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts
index 671c12cfe256..9f01f06347b7 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts
@@ -463,7 +463,7 @@ describe('DefaultSidebarItemsGenerator', () => {
     expect(sidebarSlice).toMatchSnapshot();
   });
 
-  it('throws for unknown index link', async () => {
+  it('throws for unknown index link', () => {
     const generateSidebar = () =>
       DefaultSidebarItemsGenerator({
         numberPrefixParser: DefaultNumberPrefixParser,
@@ -499,7 +499,7 @@ describe('DefaultSidebarItemsGenerator', () => {
         },
       });
 
-    await expect(generateSidebar).rejects.toThrowErrorMatchingInlineSnapshot(`
+    expect(() => generateSidebar()).toThrowErrorMatchingInlineSnapshot(`
             "Can't find any doc with ID foo.
             Available doc IDs:
             - intro"
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts
index d0a530bbd7f2..7dc7111dbe0a 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts
@@ -26,7 +26,7 @@ describe('processSidebars', () => {
   function createStaticSidebarItemGenerator(
     sidebarSlice: SidebarItem[],
   ): SidebarItemsGenerator {
-    return jest.fn(async () => sidebarSlice);
+    return jest.fn(() => sidebarSlice);
   }
 
   const StaticGeneratedSidebarSlice: NormalizedSidebar = [
@@ -40,7 +40,7 @@ describe('processSidebars', () => {
   // @ts-expect-error: good enough for this test
   const version: VersionMetadata = {
     versionName: '1.0.0',
-    versionPath: '/docs/1.0.0',
+    path: '/docs/1.0.0',
   };
 
   const params: SidebarProcessorParams = {
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts
index 7c2d4428c642..4085c9931dc7 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts
@@ -134,11 +134,11 @@ describe('createSidebarsUtils', () => {
     getFirstLink,
   } = createSidebarsUtils(sidebars);
 
-  it('getFirstDocIdOfFirstSidebar', async () => {
+  it('getFirstDocIdOfFirstSidebar', () => {
     expect(getFirstDocIdOfFirstSidebar()).toBe('doc1');
   });
 
-  it('getSidebarNameByDocId', async () => {
+  it('getSidebarNameByDocId', () => {
     expect(getSidebarNameByDocId('doc1')).toBe('sidebar1');
     expect(getSidebarNameByDocId('doc2')).toBe('sidebar1');
     expect(getSidebarNameByDocId('doc3')).toBe('sidebar2');
@@ -149,7 +149,7 @@ describe('createSidebarsUtils', () => {
     expect(getSidebarNameByDocId('unknown_id')).toBeUndefined();
   });
 
-  it('getDocNavigation', async () => {
+  it('getDocNavigation', () => {
     expect(getDocNavigation('doc1', 'doc1', undefined)).toEqual({
       sidebarName: 'sidebar1',
       previous: undefined,
@@ -229,7 +229,7 @@ describe('createSidebarsUtils', () => {
     });
   });
 
-  it('getCategoryGeneratedIndexNavigation', async () => {
+  it('getCategoryGeneratedIndexNavigation', () => {
     expect(
       getCategoryGeneratedIndexNavigation('/s3-subcategory-index-permalink'),
     ).toMatchObject({
@@ -259,7 +259,7 @@ describe('createSidebarsUtils', () => {
     });
   });
 
-  it('getCategoryGeneratedIndexList', async () => {
+  it('getCategoryGeneratedIndexList', () => {
     expect(getCategoryGeneratedIndexList()).toMatchObject([
       {
         type: 'category',
@@ -301,7 +301,7 @@ describe('createSidebarsUtils', () => {
 });
 
 describe('collectSidebarDocItems', () => {
-  it('can collect docs', async () => {
+  it('can collect docs', () => {
     const sidebar: Sidebar = [
       {
         type: 'category',
@@ -357,7 +357,7 @@ describe('collectSidebarDocItems', () => {
 });
 
 describe('collectSidebarCategories', () => {
-  it('can collect categories', async () => {
+  it('can collect categories', () => {
     const sidebar: Sidebar = [
       {
         type: 'category',
@@ -415,7 +415,7 @@ describe('collectSidebarCategories', () => {
 });
 
 describe('collectSidebarLinks', () => {
-  it('can collect links', async () => {
+  it('can collect links', () => {
     const sidebar: Sidebar = [
       {
         type: 'category',
@@ -453,7 +453,7 @@ describe('collectSidebarLinks', () => {
 });
 
 describe('collectSidebarsDocIds', () => {
-  it('can collect sidebars doc items', async () => {
+  it('can collect sidebars doc items', () => {
     const sidebar1: Sidebar = [
       {
         type: 'category',
@@ -499,7 +499,7 @@ describe('collectSidebarsDocIds', () => {
 });
 
 describe('transformSidebarItems', () => {
-  it('can transform sidebar items', async () => {
+  it('can transform sidebar items', () => {
     const sidebar: Sidebar = [
       {
         type: 'category',
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/validation.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/validation.test.ts
index d8f5fcab0d9e..8186601285a0 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/validation.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/validation.test.ts
@@ -9,7 +9,7 @@ import {validateSidebars, validateCategoryMetadataFile} from '../validation';
 import type {SidebarsConfig, CategoryMetadataFile} from '../types';
 
 describe('validateSidebars', () => {
-  it('throw for bad value', async () => {
+  it('throw for bad value', () => {
     expect(() => validateSidebars({sidebar: [{type: 42}]}))
       .toThrowErrorMatchingInlineSnapshot(`
       "{
@@ -21,12 +21,12 @@ describe('validateSidebars', () => {
     `);
   });
 
-  it('accept empty object', async () => {
+  it('accept empty object', () => {
     const sidebars: SidebarsConfig = {};
     validateSidebars(sidebars);
   });
 
-  it('accept valid values', async () => {
+  it('accept valid values', () => {
     const sidebars: SidebarsConfig = {
       sidebar1: [
         {type: 'doc', id: 'doc1'},
@@ -207,7 +207,7 @@ describe('validateSidebars', () => {
     ).toThrowErrorMatchingInlineSnapshot(`"sidebar.forEach is not a function"`);
   });
 
-  it('sidebars item doc but id is not a string', async () => {
+  it('sidebars item doc but id is not a string', () => {
     expect(() =>
       validateSidebars({
         docs: [
@@ -267,18 +267,18 @@ describe('validateSidebars', () => {
 describe('validateCategoryMetadataFile', () => {
   // TODO add more tests
 
-  it('throw for bad value', async () => {
+  it('throw for bad value', () => {
     expect(() =>
       validateCategoryMetadataFile(42),
     ).toThrowErrorMatchingInlineSnapshot(`""value" must be of type object"`);
   });
 
-  it('accept empty object', async () => {
+  it('accept empty object', () => {
     const content: CategoryMetadataFile = {};
     expect(validateCategoryMetadataFile(content)).toEqual(content);
   });
 
-  it('accept valid values', async () => {
+  it('accept valid values', () => {
     const content: CategoryMetadataFile = {
       className: 'className',
       label: 'Category Label',
@@ -295,7 +295,7 @@ describe('validateCategoryMetadataFile', () => {
     expect(validateCategoryMetadataFile(content)).toEqual(content);
   });
 
-  it('rejects permalink', async () => {
+  it('rejects permalink', () => {
     const content: CategoryMetadataFile = {
       className: 'className',
       label: 'Category Label',
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts
index 56e0025a81af..7dc6ece7bedc 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts
@@ -46,7 +46,7 @@ type Dir = {
 };
 
 // Comment for this feature: https://github.com/facebook/docusaurus/issues/3464#issuecomment-818670449
-export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = async ({
+export const DefaultSidebarItemsGenerator: SidebarItemsGenerator = ({
   numberPrefixParser,
   isCategoryIndex,
   docs: allDocs,
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
index 307ed9de8675..58c69912d704 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
@@ -84,7 +84,7 @@ function postProcessSidebarItem(
       };
     }
     // A non-collapsible category can't be collapsed!
-    if (category.collapsible === false) {
+    if (!category.collapsible) {
       category.collapsed = false;
     }
     return category;
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/types.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/types.ts
index 8284f09048ee..8d038f417537 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/types.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/types.ts
@@ -251,7 +251,7 @@ export type SidebarItemsGeneratorArgs = {
 };
 export type SidebarItemsGenerator = (
   generatorArgs: SidebarItemsGeneratorArgs,
-) => Promise<NormalizedSidebar>;
+) => NormalizedSidebar | Promise<NormalizedSidebar>;
 
 export type SidebarItemsGeneratorOption = (
   generatorArgs: {
@@ -262,7 +262,7 @@ export type SidebarItemsGeneratorOption = (
      */
     defaultSidebarItemsGenerator: SidebarItemsGenerator;
   } & SidebarItemsGeneratorArgs,
-) => Promise<NormalizedSidebarItem[]>;
+) => NormalizedSidebar | Promise<NormalizedSidebar>;
 
 export type SidebarProcessorParams = {
   sidebarItemsGenerator: SidebarItemsGeneratorOption;
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts
index a213b2e7dedc..0c743f42d537 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts
@@ -257,7 +257,7 @@ export function createSidebarsUtils(sidebars: Sidebars): SidebarsUtils {
     ): boolean {
       return (
         item.type === 'category' &&
-        item.link?.type === 'generated-index' &&
+        item.link.type === 'generated-index' &&
         item.link.permalink === categoryGeneratedIndexPermalink
       );
     }
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/validation.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/validation.ts
index 22ddcfbf77ce..b9b1bfae007e 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/validation.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/validation.ts
@@ -144,7 +144,7 @@ function validateSidebarItem(
   // manually
   Joi.assert(item, sidebarItemSchema);
 
-  if ((item as NormalizedSidebarItemCategory).type === 'category') {
+  if ((item as NormalizedSidebarItem).type === 'category') {
     (item as NormalizedSidebarItemCategory).items.forEach(validateSidebarItem);
   }
 }
@@ -170,5 +170,9 @@ const categoryMetadataFileSchema = Joi.object<CategoryMetadataFile>({
 export function validateCategoryMetadataFile(
   unsafeContent: unknown,
 ): CategoryMetadataFile {
-  return Joi.attempt(unsafeContent, categoryMetadataFileSchema);
+  const {error, value} = categoryMetadataFileSchema.validate(unsafeContent);
+  if (error) {
+    throw error;
+  }
+  return value;
 }
diff --git a/packages/docusaurus-plugin-content-docs/src/slug.ts b/packages/docusaurus-plugin-content-docs/src/slug.ts
index 4815e210b01d..130c7a63b1f5 100644
--- a/packages/docusaurus-plugin-content-docs/src/slug.ts
+++ b/packages/docusaurus-plugin-content-docs/src/slug.ts
@@ -58,7 +58,7 @@ export default function getSlug({
     ) {
       return dirNameSlug;
     }
-    const baseSlug = frontMatterSlug || baseID;
+    const baseSlug = frontMatterSlug ?? baseID;
     return resolvePathname(baseSlug, getDirNameSlug());
   }
 
diff --git a/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts b/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts
index 4a3448460a24..773643ba8441 100644
--- a/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts
@@ -604,7 +604,7 @@ describe('readVersionsMetadata', () => {
           context: defaultContext,
         }),
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Versions should be strings. Found type "number" for version "1.1"."`,
+        `"Versions should be strings. Found type "number" for version 1.1."`,
       );
       jsonMock.mockImplementationOnce(() => ['   ']);
 
diff --git a/packages/docusaurus-plugin-content-docs/src/versions/validation.ts b/packages/docusaurus-plugin-content-docs/src/versions/validation.ts
index 422d58f713d3..c2f1505275a0 100644
--- a/packages/docusaurus-plugin-content-docs/src/versions/validation.ts
+++ b/packages/docusaurus-plugin-content-docs/src/versions/validation.ts
@@ -11,7 +11,9 @@ import type {VersionsOptions} from '@docusaurus/plugin-content-docs';
 export function validateVersionName(name: unknown): asserts name is string {
   if (typeof name !== 'string') {
     throw new Error(
-      `Versions should be strings. Found type "${typeof name}" for version "${name}".`,
+      `Versions should be strings. Found type "${typeof name}" for version ${JSON.stringify(
+        name,
+      )}.`,
     );
   }
   if (!name.trim()) {
diff --git a/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.ts
index f3b94d2df5f4..31706d3a4cd4 100644
--- a/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.ts
@@ -16,7 +16,7 @@ describe('docusaurus-plugin-content-pages', () => {
   it('loads simple pages', async () => {
     const siteDir = path.join(__dirname, '__fixtures__', 'website');
     const context = await loadContext({siteDir});
-    const plugin = await pluginContentPages(
+    const plugin = pluginContentPages(
       context,
       validateOptions({
         validate: normalizePluginOptions,
@@ -33,7 +33,7 @@ describe('docusaurus-plugin-content-pages', () => {
   it('loads simple pages with french translations', async () => {
     const siteDir = path.join(__dirname, '__fixtures__', 'website');
     const context = await loadContext({siteDir});
-    const plugin = await pluginContentPages(
+    const plugin = pluginContentPages(
       {
         ...context,
         i18n: {
diff --git a/packages/docusaurus-plugin-content-pages/src/index.ts b/packages/docusaurus-plugin-content-pages/src/index.ts
index 66bcb0d15712..a9051e4545e6 100644
--- a/packages/docusaurus-plugin-content-pages/src/index.ts
+++ b/packages/docusaurus-plugin-content-pages/src/index.ts
@@ -39,10 +39,10 @@ export function getContentPathList(contentPaths: PagesContentPaths): string[] {
 const isMarkdownSource = (source: string) =>
   source.endsWith('.md') || source.endsWith('.mdx');
 
-export default async function pluginContentPages(
+export default function pluginContentPages(
   context: LoadContext,
   options: PluginOptions,
-): Promise<Plugin<LoadedContent | null>> {
+): Plugin<LoadedContent | null> {
   if (options.admonitions) {
     options.remarkPlugins = options.remarkPlugins.concat([
       [admonitions, options.admonitions],
diff --git a/packages/docusaurus-plugin-content-pages/src/markdownLoader.ts b/packages/docusaurus-plugin-content-pages/src/markdownLoader.ts
index e8ca79a21681..e5c91b7bf797 100644
--- a/packages/docusaurus-plugin-content-pages/src/markdownLoader.ts
+++ b/packages/docusaurus-plugin-content-pages/src/markdownLoader.ts
@@ -18,5 +18,5 @@ export default function markdownLoader(
   // TODO provide additional md processing here? like interlinking pages?
   // fileString = linkify(fileString)
 
-  return callback?.(null, fileString);
+  return callback(null, fileString);
 }
diff --git a/packages/docusaurus-plugin-content-pages/src/options.ts b/packages/docusaurus-plugin-content-pages/src/options.ts
index 475ed8311060..2c1f38201c30 100644
--- a/packages/docusaurus-plugin-content-pages/src/options.ts
+++ b/packages/docusaurus-plugin-content-pages/src/options.ts
@@ -28,7 +28,7 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   admonitions: {},
 };
 
-const PluginOptionSchema = Joi.object({
+const PluginOptionSchema = Joi.object<PluginOptions>({
   path: Joi.string().default(DEFAULT_OPTIONS.path),
   routeBasePath: Joi.string().default(DEFAULT_OPTIONS.routeBasePath),
   include: Joi.array().items(Joi.string()).default(DEFAULT_OPTIONS.include),
diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx b/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx
index 64d3954842c5..c366475762f8 100644
--- a/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx
+++ b/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx
@@ -20,7 +20,7 @@ export default function DebugMetadata(): JSX.Element {
       </div>
       <div>
         Site Version:{' '}
-        <code>{siteMetadata.siteVersion || 'No version specified'}</code>
+        <code>{siteMetadata.siteVersion ?? 'No version specified'}</code>
       </div>
       <h3 className={styles.sectionTitle}>Plugins and themes</h3>
       <ul className="clean-list">
diff --git a/packages/docusaurus-plugin-google-gtag/src/index.ts b/packages/docusaurus-plugin-google-gtag/src/index.ts
index 7724c9676683..2e278094e105 100644
--- a/packages/docusaurus-plugin-google-gtag/src/index.ts
+++ b/packages/docusaurus-plugin-google-gtag/src/index.ts
@@ -25,7 +25,7 @@ export default function pluginGoogleGtag(
   return {
     name: 'docusaurus-plugin-google-gtag',
 
-    async contentLoaded({actions}) {
+    contentLoaded({actions}) {
       actions.setGlobalData(options);
     },
 
diff --git a/packages/docusaurus-plugin-ideal-image/src/index.ts b/packages/docusaurus-plugin-ideal-image/src/index.ts
index d650e33b1006..4b8862171859 100644
--- a/packages/docusaurus-plugin-ideal-image/src/index.ts
+++ b/packages/docusaurus-plugin-ideal-image/src/index.ts
@@ -80,7 +80,7 @@ export function validateOptions({
   validate,
   options,
 }: OptionValidationContext<PluginOptions, PluginOptions>): PluginOptions {
-  const pluginOptionsSchema = Joi.object({
+  const pluginOptionsSchema = Joi.object<PluginOptions>({
     disableInDev: Joi.boolean().default(true),
   }).unknown();
   return validate(pluginOptionsSchema, options);
diff --git a/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage/index.tsx b/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage/index.tsx
index ff8ea85f6f2b..fbf2d3278a9b 100644
--- a/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage/index.tsx
+++ b/packages/docusaurus-plugin-ideal-image/src/theme/IdealImage/index.tsx
@@ -22,9 +22,9 @@ function bytesToSize(bytes: number) {
   }
   const scale = Math.floor(Math.log(bytes) / Math.log(1024));
   if (scale === 0) {
-    return `${bytes} ${sizes[scale]}`;
+    return `${bytes} ${sizes[scale]!}`;
   }
-  return `${(bytes / 1024 ** scale).toFixed(1)} ${sizes[scale]}`;
+  return `${(bytes / 1024 ** scale).toFixed(1)} ${sizes[scale]!}`;
 }
 
 // Adopted from https://github.com/endiliey/react-ideal-image/blob/master/src/components/IdealImage/index.js#L43-L75
@@ -100,8 +100,8 @@ export default function IdealImage(props: Props): JSX.Element {
       {...props}
       alt={alt}
       className={className}
-      height={img.src.height || 100}
-      width={img.src.width || 100}
+      height={img.src.height ?? 100}
+      width={img.src.width ?? 100}
       placeholder={{lqip: img.preSrc}}
       src={img.src.src}
       srcSet={img.src.images.map((image) => ({
diff --git a/packages/docusaurus-plugin-pwa/src/index.ts b/packages/docusaurus-plugin-pwa/src/index.ts
index 7ec58b25f439..448e7d2f9917 100644
--- a/packages/docusaurus-plugin-pwa/src/index.ts
+++ b/packages/docusaurus-plugin-pwa/src/index.ts
@@ -89,7 +89,7 @@ export default function pluginPWA(
           new webpack.EnvironmentPlugin({
             PWA_DEBUG: debug,
             PWA_SERVICE_WORKER_URL: path.posix.resolve(
-              `${config.output?.publicPath || '/'}`,
+              `${(config.output?.publicPath as string) || '/'}`,
               'sw.js',
             ),
             PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES:
@@ -102,7 +102,7 @@ export default function pluginPWA(
 
     injectHtmlTags() {
       const headTags: HtmlTags = [];
-      if (isProd && pwaHead) {
+      if (isProd) {
         pwaHead.forEach(({tagName, ...attributes}) => {
           (['href', 'content'] as const).forEach((attribute) => {
             const attributeValue = attributes[attribute];
@@ -160,7 +160,7 @@ export default function pluginPWA(
         plugins: [
           new webpack.EnvironmentPlugin({
             // Fallback value required with Webpack 5
-            PWA_SW_CUSTOM: swCustom || '',
+            PWA_SW_CUSTOM: swCustom ?? '',
           }),
           new LogPlugin({
             name: 'Service Worker',
@@ -189,7 +189,7 @@ export default function pluginPWA(
           '**/*.{png,jpg,jpeg,gif,svg,ico}',
           '**/*.{woff,woff2,eot,ttf,otf}',
           // @ts-expect-error: internal API?
-          ...(injectManifest.globPatterns ?? []),
+          ...((injectManifest.globPatterns as string[] | undefined) ?? []),
         ],
         // Those attributes are not overrideable
         swDest,
diff --git a/packages/docusaurus-plugin-pwa/src/options.ts b/packages/docusaurus-plugin-pwa/src/options.ts
index e96405756ad1..8517028f9f20 100644
--- a/packages/docusaurus-plugin-pwa/src/options.ts
+++ b/packages/docusaurus-plugin-pwa/src/options.ts
@@ -23,7 +23,7 @@ const DEFAULT_OPTIONS = {
   reloadPopup: '@theme/PwaReloadPopup',
 };
 
-const Schema = Joi.object({
+const optionsSchema = Joi.object<PluginOptions>({
   debug: Joi.bool().default(DEFAULT_OPTIONS.debug),
   offlineModeActivationStrategies: Joi.array()
     .items(
@@ -58,5 +58,5 @@ export function validateOptions({
   validate,
   options,
 }: OptionValidationContext<PluginOptions, PluginOptions>): PluginOptions {
-  return validate(Schema, options);
+  return validate(optionsSchema, options);
 }
diff --git a/packages/docusaurus-plugin-pwa/src/registerSw.ts b/packages/docusaurus-plugin-pwa/src/registerSw.ts
index 2bb7a92eb06b..d48e7b29b2f7 100644
--- a/packages/docusaurus-plugin-pwa/src/registerSw.ts
+++ b/packages/docusaurus-plugin-pwa/src/registerSw.ts
@@ -9,7 +9,7 @@ import {createStorageSlot} from '@docusaurus/theme-common';
 
 // First: read the env variables (provided by Webpack)
 /* eslint-disable prefer-destructuring */
-const PWA_SERVICE_WORKER_URL = process.env.PWA_SERVICE_WORKER_URL;
+const PWA_SERVICE_WORKER_URL = process.env.PWA_SERVICE_WORKER_URL!;
 const PWA_RELOAD_POPUP = process.env.PWA_RELOAD_POPUP;
 const PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES = process.env
   .PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES as unknown as (keyof typeof OfflineModeActivationStrategiesImplementations)[];
@@ -34,7 +34,7 @@ async function clearRegistrations() {
   }
   await Promise.all(
     registrations.map(async (registration) => {
-      const result = await registration?.unregister();
+      const result = await registration.unregister();
       if (debug) {
         console.log(
           `[Docusaurus-PWA][registerSw]: unregister() service worker registration`,
@@ -69,7 +69,7 @@ async function isAppInstalledEventFired() {
 declare global {
   interface Navigator {
     getInstalledRelatedApps: () => Promise<{platform: string}[]>;
-    connection: {effectiveType: string; saveData: boolean};
+    connection?: {effectiveType: string; saveData: boolean};
   }
 }
 
diff --git a/packages/docusaurus-plugin-sitemap/src/options.ts b/packages/docusaurus-plugin-sitemap/src/options.ts
index 5a8302424e83..365f60156eaf 100644
--- a/packages/docusaurus-plugin-sitemap/src/options.ts
+++ b/packages/docusaurus-plugin-sitemap/src/options.ts
@@ -29,7 +29,8 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   ignorePatterns: [],
 };
 
-const PluginOptionSchema = Joi.object({
+const PluginOptionSchema = Joi.object<PluginOptions>({
+  // @ts-expect-error: forbidden
   cacheTime: Joi.forbidden().messages({
     'any.unknown':
       'Option `cacheTime` in sitemap config is deprecated. Please remove it.',
diff --git a/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts b/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts
index 28b4c7e89150..39236a1537b4 100644
--- a/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts
+++ b/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts
@@ -62,8 +62,8 @@ const nodeForImport: Literal = {
 const plugin: Plugin<[PluginOptions?]> = (options = {}) => {
   const {sync = false} = options;
   return (root) => {
-    let transformed = false;
-    let alreadyImported = false;
+    let transformed = false as boolean;
+    let alreadyImported = false as boolean;
     visit(root, (node: Node) => {
       if (isImport(node) && node.value.includes('@theme/Tabs')) {
         alreadyImported = true;
diff --git a/packages/docusaurus-theme-classic/src/index.ts b/packages/docusaurus-theme-classic/src/index.ts
index a0cb4629cb58..c87fef7f4b7e 100644
--- a/packages/docusaurus-theme-classic/src/index.ts
+++ b/packages/docusaurus-theme-classic/src/index.ts
@@ -177,7 +177,7 @@ export default function themeClassic(
         const plugin: PostCssPlugin = {
           postcssPlugin: 'RtlCssPlugin',
           prepare: (result) => {
-            const file = result.root?.source?.input?.file;
+            const file = result.root.source?.input.file;
             // Skip Infima as we are using the its RTL version.
             if (file === resolvedInfimaFile) {
               return {};
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index ef8c33023fd2..4aa679bd4946 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -21,12 +21,14 @@
 // in their tsconfig.
 
 declare module '@docusaurus/theme-classic' {
-  import type {LoadContext, Plugin} from '@docusaurus/types';
+  import type {LoadContext, Plugin, PluginModule} from '@docusaurus/types';
 
   export type Options = {
     customCss?: string | string[];
   };
 
+  export const getSwizzleConfig: PluginModule['getSwizzleConfig'];
+
   export default function themeClassic(
     context: LoadContext,
     options: Options,
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/String.tsx b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/String.tsx
index 5a9384f7b638..9947164ddbef 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/String.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/String.tsx
@@ -52,7 +52,7 @@ export default function CodeBlockString({
     magicComments,
   });
   const showLineNumbers =
-    showLineNumbersProp || containsLineNumbers(metastring);
+    showLineNumbersProp ?? containsLineNumbers(metastring);
 
   return (
     <Container
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx
index 7f6bab8f6cc6..a7413b0d7154 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx
@@ -23,7 +23,7 @@ export default function DocSidebarItemHtml({
       className={clsx(
         ThemeClassNames.docs.docSidebarItemLink,
         ThemeClassNames.docs.docSidebarItemLinkLevel(level),
-        defaultStyle && `${styles.menuHtmlItem} menu__list-item`,
+        defaultStyle && [styles.menuHtmlItem, 'menu__list-item'],
         className,
       )}
       key={index}
diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/Links/MultiColumn/index.tsx b/packages/docusaurus-theme-classic/src/theme/Footer/Links/MultiColumn/index.tsx
index 01b362e520c0..2239e8c8fb66 100644
--- a/packages/docusaurus-theme-classic/src/theme/Footer/Links/MultiColumn/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Footer/Links/MultiColumn/index.tsx
@@ -21,7 +21,7 @@ function ColumnLinkItem({item}: {item: ColumnItemType}) {
       dangerouslySetInnerHTML={{__html: item.html}}
     />
   ) : (
-    <li key={item.href || item.to} className="footer__item">
+    <li key={item.href ?? item.to} className="footer__item">
       <LinkItem item={item} />
     </li>
   );
diff --git a/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx b/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx
index b6210a2b3660..39c6ce63fdf1 100644
--- a/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx
+++ b/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx
@@ -27,7 +27,7 @@ export function useCollapsible({
   initialState,
 }: {
   /** The initial state. Will be non-collapsed by default. */
-  initialState: boolean | (() => boolean);
+  initialState?: boolean | (() => boolean);
 }): {
   collapsed: boolean;
   setCollapsed: Dispatch<SetStateAction<boolean>>;
diff --git a/packages/docusaurus-theme-common/src/hooks/useSkipToContent.ts b/packages/docusaurus-theme-common/src/hooks/useSkipToContent.ts
index 54e6a42f3a85..bdcac465d487 100644
--- a/packages/docusaurus-theme-common/src/hooks/useSkipToContent.ts
+++ b/packages/docusaurus-theme-common/src/hooks/useSkipToContent.ts
@@ -40,7 +40,7 @@ export function useSkipToContent(): {
     e.preventDefault();
 
     const targetElement: HTMLElement | null =
-      document.querySelector('main:first-of-type') ||
+      document.querySelector('main:first-of-type') ??
       document.querySelector(`.${ThemeClassNames.wrapper.main}`);
 
     if (targetElement) {
diff --git a/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts b/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts
index fca0174fe644..924ede9e09c3 100644
--- a/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts
+++ b/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts
@@ -38,15 +38,12 @@ function getAnchors({
 }: {
   minHeadingLevel: number;
   maxHeadingLevel: number;
-}) {
+}): HTMLElement[] {
   const selectors = [];
   for (let i = minHeadingLevel; i <= maxHeadingLevel; i += 1) {
     selectors.push(`h${i}.anchor`);
   }
-
-  return Array.from(
-    document.querySelectorAll(selectors.join()),
-  ) as HTMLElement[];
+  return Array.from(document.querySelectorAll(selectors.join()));
 }
 
 function getActiveAnchor(
diff --git a/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts b/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts
index 97c9056eb297..a0d3163df88e 100644
--- a/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts
@@ -171,7 +171,7 @@ export function parseLines(
     const metastringRangeClassName = magicComments[0]!.className;
     const lines = rangeParser(linesRange)
       .filter((n) => n > 0)
-      .map((n) => [n - 1, [metastringRangeClassName]]);
+      .map((n) => [n - 1, [metastringRangeClassName]] as [number, string[]]);
     return {lineClassNames: Object.fromEntries(lines), code};
   }
   if (language === undefined) {
@@ -189,7 +189,7 @@ export function parseLines(
   const lineToClassName: {[comment: string]: string} = Object.fromEntries(
     magicComments
       .filter((d) => d.line)
-      .map(({className, line}) => [line, className]),
+      .map(({className, line}) => [line!, className] as [string, string]),
   );
   const blockStartToClassName: {[comment: string]: string} = Object.fromEntries(
     magicComments
diff --git a/packages/docusaurus-theme-common/src/utils/reactUtils.tsx b/packages/docusaurus-theme-common/src/utils/reactUtils.tsx
index 09cb1b7b52e7..4a7410e3fb6d 100644
--- a/packages/docusaurus-theme-common/src/utils/reactUtils.tsx
+++ b/packages/docusaurus-theme-common/src/utils/reactUtils.tsx
@@ -70,7 +70,7 @@ export class ReactContextError extends Error {
     this.name = 'ReactContextError';
     this.message = `Hook ${
       this.stack?.split('\n')[1]?.match(/at (?:\w+\.)?(?<name>\w+)/)?.groups!
-        .name
+        .name ?? ''
     } is called outside the <${providerName}>. ${additionalInfo || ''}`;
   }
 }
diff --git a/packages/docusaurus-theme-common/src/utils/routesUtils.ts b/packages/docusaurus-theme-common/src/utils/routesUtils.ts
index 4faa24b675a0..b662ab4bf23d 100644
--- a/packages/docusaurus-theme-common/src/utils/routesUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/routesUtils.ts
@@ -18,7 +18,7 @@ export function isSamePath(
   path2: string | undefined,
 ): boolean {
   const normalize = (pathname: string | undefined) =>
-    (!pathname || pathname?.endsWith('/')
+    (!pathname || pathname.endsWith('/')
       ? pathname
       : `${pathname}/`
     )?.toLowerCase();
diff --git a/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx b/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx
index 32095c3feac3..514222d18ac0 100644
--- a/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx
+++ b/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx
@@ -112,11 +112,7 @@ export function useScrollPosition(
         return;
       }
       const currentPosition = getScrollPosition()!;
-
-      if (dynamicEffect) {
-        dynamicEffect(currentPosition, lastPositionRef.current);
-      }
-
+      dynamicEffect(currentPosition, lastPositionRef.current);
       lastPositionRef.current = currentPosition;
     };
 
diff --git a/packages/docusaurus-theme-common/src/utils/searchUtils.ts b/packages/docusaurus-theme-common/src/utils/searchUtils.ts
index 7f6fe91e48f0..082f0fb7085c 100644
--- a/packages/docusaurus-theme-common/src/utils/searchUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/searchUtils.ts
@@ -39,7 +39,7 @@ export function useContextualSearchFilters(): {locale: string; tags: string[]} {
   // plugin instances.
   function getDocPluginTags(pluginId: string) {
     const activeVersion =
-      activePluginAndVersion?.activePlugin?.pluginId === pluginId
+      activePluginAndVersion?.activePlugin.pluginId === pluginId
         ? activePluginAndVersion.activeVersion
         : undefined;
 
diff --git a/packages/docusaurus-theme-common/src/utils/tocUtils.ts b/packages/docusaurus-theme-common/src/utils/tocUtils.ts
index 8f12d780719d..64be4cb51191 100644
--- a/packages/docusaurus-theme-common/src/utils/tocUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/tocUtils.ts
@@ -27,7 +27,7 @@ function treeifyTOC(flatTOC: readonly TOCItem[]): TOCTreeNode[] {
   // level <i>. We will modify these indices as we iterate through all headings.
   // e.g. if an ### H3 was last seen at index 2, then prevIndexForLevel[3] === 2
   // indices 0 and 1 will remain unused.
-  const prevIndexForLevel = Array(7).fill(-1);
+  const prevIndexForLevel = Array<number>(7).fill(-1);
 
   headings.forEach((curr, currIndex) => {
     // Take the last seen index for each ancestor level. the highest index will
diff --git a/packages/docusaurus-theme-common/src/utils/usePluralForm.ts b/packages/docusaurus-theme-common/src/utils/usePluralForm.ts
index cc5ce45317bf..726d406db2d7 100644
--- a/packages/docusaurus-theme-common/src/utils/usePluralForm.ts
+++ b/packages/docusaurus-theme-common/src/utils/usePluralForm.ts
@@ -95,7 +95,11 @@ function selectPluralMessage(
   }
   if (parts.length > localePluralForms.pluralForms.length) {
     console.error(
-      `For locale=${localePluralForms.locale}, a maximum of ${localePluralForms.pluralForms.length} plural forms are expected (${localePluralForms.pluralForms}), but the message contains ${parts.length}: ${pluralMessages}`,
+      `For locale=${localePluralForms.locale}, a maximum of ${
+        localePluralForms.pluralForms.length
+      } plural forms are expected (${localePluralForms.pluralForms.join(
+        ',',
+      )}), but the message contains ${parts.length}: ${pluralMessages}`,
     );
   }
   const pluralForm = localePluralForms.select(count);
diff --git a/packages/docusaurus-theme-live-codeblock/src/validateThemeConfig.ts b/packages/docusaurus-theme-live-codeblock/src/validateThemeConfig.ts
index 4b9fb583be03..d642214987de 100644
--- a/packages/docusaurus-theme-live-codeblock/src/validateThemeConfig.ts
+++ b/packages/docusaurus-theme-live-codeblock/src/validateThemeConfig.ts
@@ -15,7 +15,7 @@ export const DEFAULT_CONFIG = {
   playgroundPosition: 'bottom',
 };
 
-export const Schema = Joi.object({
+export const Schema = Joi.object<ThemeConfig>({
   liveCodeBlock: Joi.object({
     playgroundPosition: Joi.string()
       .equal('top', 'bottom')
diff --git a/packages/docusaurus-theme-search-algolia/src/index.ts b/packages/docusaurus-theme-search-algolia/src/index.ts
index dbd2a58db30c..af54aafba33f 100644
--- a/packages/docusaurus-theme-search-algolia/src/index.ts
+++ b/packages/docusaurus-theme-search-algolia/src/index.ts
@@ -60,7 +60,7 @@ export default function themeSearchAlgolia(context: LoadContext): Plugin<void> {
       });
     },
 
-    async contentLoaded({actions: {addRoute}}) {
+    contentLoaded({actions: {addRoute}}) {
       if (searchPagePath) {
         addRoute({
           path: normalizeUrl([baseUrl, searchPagePath]),
diff --git a/packages/docusaurus-theme-search-algolia/src/validateThemeConfig.ts b/packages/docusaurus-theme-search-algolia/src/validateThemeConfig.ts
index 68bd60d163a1..a2a2ccd7869e 100644
--- a/packages/docusaurus-theme-search-algolia/src/validateThemeConfig.ts
+++ b/packages/docusaurus-theme-search-algolia/src/validateThemeConfig.ts
@@ -20,7 +20,7 @@ export const DEFAULT_CONFIG = {
   searchPagePath: 'search',
 };
 
-export const Schema = Joi.object({
+export const Schema = Joi.object<ThemeConfig>({
   algolia: Joi.object({
     // Docusaurus attributes
     contextualSearch: Joi.boolean().default(DEFAULT_CONFIG.contextualSearch),
diff --git a/packages/docusaurus-theme-translations/src/index.ts b/packages/docusaurus-theme-translations/src/index.ts
index f6b7e7303e19..8b9afb841d90 100644
--- a/packages/docusaurus-theme-translations/src/index.ts
+++ b/packages/docusaurus-theme-translations/src/index.ts
@@ -25,9 +25,9 @@ export function codeTranslationLocalesToTry(locale: string): string[] {
     // unresolved except for simply locales
     locale,
     // "zh-CN" / "pt-BR"
-    `${maximizedLocale.language}-${maximizedLocale.region}`,
+    `${maximizedLocale.language!}-${maximizedLocale.region!}`,
     // "zh-Hans" / "pt-Latn"
-    `${maximizedLocale.language}-${maximizedLocale.script}`,
+    `${maximizedLocale.language!}-${maximizedLocale.script!}`,
     // "zh" / "pt"
     maximizedLocale.language!,
   ];
diff --git a/packages/docusaurus-utils-validation/src/JoiFrontMatter.ts b/packages/docusaurus-utils-validation/src/JoiFrontMatter.ts
index b09f528ec14d..5de48285cc38 100644
--- a/packages/docusaurus-utils-validation/src/JoiFrontMatter.ts
+++ b/packages/docusaurus-utils-validation/src/JoiFrontMatter.ts
@@ -28,4 +28,4 @@ const JoiFrontMatterString: Joi.Extension = {
  * @see https://github.com/facebook/docusaurus/issues/4642
  * @see https://github.com/sideway/joi/issues/1442#issuecomment-823997884
  */
-export const JoiFrontMatter: typeof Joi = Joi.extend(JoiFrontMatterString);
+export const JoiFrontMatter = Joi.extend(JoiFrontMatterString) as typeof Joi;
diff --git a/packages/docusaurus-utils/src/pathUtils.ts b/packages/docusaurus-utils/src/pathUtils.ts
index a9fbb0bd98f7..35b8bd2656e8 100644
--- a/packages/docusaurus-utils/src/pathUtils.ts
+++ b/packages/docusaurus-utils/src/pathUtils.ts
@@ -56,7 +56,7 @@ export function shortName(str: string): string {
  * Adopted from https://github.com/sindresorhus/slash/blob/main/index.js
  */
 export function posixPath(str: string): string {
-  const isExtendedLengthPath = /^\\\\\?\\/.test(str);
+  const isExtendedLengthPath = str.startsWith('\\\\?\\');
 
   // Forward slashes are only valid Windows paths when they don't contain non-
   // ascii characters.
diff --git a/packages/docusaurus-utils/src/urlUtils.ts b/packages/docusaurus-utils/src/urlUtils.ts
index 708d50dbfe57..06694a00bd09 100644
--- a/packages/docusaurus-utils/src/urlUtils.ts
+++ b/packages/docusaurus-utils/src/urlUtils.ts
@@ -72,11 +72,11 @@ export function normalizeUrl(rawUrls: string[]): string {
           /^\/+/,
           // Special case where the first element of rawUrls is empty
           // ["", "/hello"] => /hello
-          component[0] === '/' && !hasStartingSlash ? '/' : '',
+          component.startsWith('/') && !hasStartingSlash ? '/' : '',
         );
       }
 
-      hasEndingSlash = component[component.length - 1] === '/';
+      hasEndingSlash = component.endsWith('/');
       // Removing the ending slashes for each component but the last. For the
       // last component we will combine multiple slashes to a single one.
       component = component.replace(/\/+$/, i < urls.length - 1 ? '' : '/');
@@ -95,7 +95,7 @@ export function normalizeUrl(rawUrls: string[]): string {
 
   // Replace ? in parameters with &.
   const parts = str.split('?');
-  str = parts.shift() + (parts.length > 0 ? '?' : '') + parts.join('&');
+  str = parts.shift()! + (parts.length > 0 ? '?' : '') + parts.join('&');
 
   // Dedupe forward slashes in the entire path, avoiding protocol slashes.
   str = str.replace(/(?<textBefore>[^:/]\/)\/+/g, '$1');
diff --git a/packages/docusaurus/src/client/docusaurus.ts b/packages/docusaurus/src/client/docusaurus.ts
index 80fa879e30cb..987f931ede0a 100644
--- a/packages/docusaurus/src/client/docusaurus.ts
+++ b/packages/docusaurus/src/client/docusaurus.ts
@@ -19,7 +19,7 @@ declare global {
   // eslint-disable-next-line camelcase, no-underscore-dangle
   const __webpack_require__: {gca: (name: string) => string};
   interface Navigator {
-    connection: {effectiveType: string; saveData: boolean};
+    connection?: {effectiveType: string; saveData: boolean};
   }
 }
 
diff --git a/packages/docusaurus/src/client/exports/useBaseUrl.ts b/packages/docusaurus/src/client/exports/useBaseUrl.ts
index 174ea539c1b7..c5481e57670f 100644
--- a/packages/docusaurus/src/client/exports/useBaseUrl.ts
+++ b/packages/docusaurus/src/client/exports/useBaseUrl.ts
@@ -10,7 +10,7 @@ import {hasProtocol} from './isInternalUrl';
 import type {BaseUrlOptions, BaseUrlUtils} from '@docusaurus/useBaseUrl';
 
 function addBaseUrl(
-  siteUrl: string | undefined,
+  siteUrl: string,
   baseUrl: string,
   url: string,
   {forcePrependBaseUrl = false, absolute = false}: BaseUrlOptions = {},
diff --git a/packages/docusaurus/src/commands/serve.ts b/packages/docusaurus/src/commands/serve.ts
index da94dc86678d..64845cb5ced4 100644
--- a/packages/docusaurus/src/commands/serve.ts
+++ b/packages/docusaurus/src/commands/serve.ts
@@ -66,7 +66,7 @@ export async function serve(
 
     // Remove baseUrl before calling serveHandler, because /baseUrl/ should
     // serve /build/index.html, not /build/baseUrl/index.html (does not exist)
-    req.url = req.url?.replace(baseUrl, '/');
+    req.url = req.url.replace(baseUrl, '/');
 
     serveHandler(req, res, {
       cleanUrls: true,
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts
index cb924a626ffc..8042d3d51dae 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts
@@ -9,14 +9,14 @@ import {normalizeSwizzleConfig} from '../config';
 import type {SwizzleConfig} from '@docusaurus/types';
 
 describe('normalizeSwizzleConfig', () => {
-  it(`validate no components config`, async () => {
+  it(`validate no components config`, () => {
     const config: SwizzleConfig = {
       components: {},
     };
     expect(normalizeSwizzleConfig(config)).toEqual(config);
   });
 
-  it(`validate complete config`, async () => {
+  it(`validate complete config`, () => {
     const config: SwizzleConfig = {
       components: {
         SomeComponent: {
@@ -38,7 +38,7 @@ describe('normalizeSwizzleConfig', () => {
     expect(normalizeSwizzleConfig(config)).toEqual(config);
   });
 
-  it(`normalize partial config`, async () => {
+  it(`normalize partial config`, () => {
     const config: SwizzleConfig = {
       components: {
         SomeComponent: {
@@ -59,7 +59,7 @@ describe('normalizeSwizzleConfig', () => {
     expect(normalizeSwizzleConfig(config)).toMatchSnapshot();
   });
 
-  it(`reject missing components`, async () => {
+  it(`reject missing components`, () => {
     // @ts-expect-error: incomplete actions map
     const config: SwizzleConfig = {};
 
@@ -70,7 +70,7 @@ describe('normalizeSwizzleConfig', () => {
     );
   });
 
-  it(`reject invalid action name`, async () => {
+  it(`reject invalid action name`, () => {
     const config: SwizzleConfig = {
       components: {
         MyComponent: {
@@ -91,7 +91,7 @@ describe('normalizeSwizzleConfig', () => {
     );
   });
 
-  it(`reject invalid action status`, async () => {
+  it(`reject invalid action status`, () => {
     const config: SwizzleConfig = {
       components: {
         MyComponent: {
diff --git a/packages/docusaurus/src/commands/swizzle/actions.ts b/packages/docusaurus/src/commands/swizzle/actions.ts
index e295f8c2bd2d..44aba75cca13 100644
--- a/packages/docusaurus/src/commands/swizzle/actions.ts
+++ b/packages/docusaurus/src/commands/swizzle/actions.ts
@@ -109,7 +109,7 @@ export async function wrap({
   const isDirectory = await isDir(path.join(themePath, themeComponentName));
 
   // Top/Parent/ComponentName => ComponentName
-  const componentName = _.last(themeComponentName.split('/'));
+  const componentName = _.last(themeComponentName.split('/'))!;
   const wrapperComponentName = `${componentName}Wrapper`;
 
   const wrapperFileName = `${themeComponentName}${isDirectory ? '/index' : ''}${
diff --git a/packages/docusaurus/src/commands/swizzle/config.ts b/packages/docusaurus/src/commands/swizzle/config.ts
index 83f0bbe75101..b72f30cc60c9 100644
--- a/packages/docusaurus/src/commands/swizzle/config.ts
+++ b/packages/docusaurus/src/commands/swizzle/config.ts
@@ -16,9 +16,8 @@ function getModuleSwizzleConfig(
   swizzlePlugin: SwizzlePlugin,
 ): SwizzleConfig | undefined {
   const getSwizzleConfig =
-    swizzlePlugin.plugin.plugin?.getSwizzleConfig ??
-    swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig ??
-    swizzlePlugin.plugin.pluginModule?.module?.getSwizzleConfig;
+    swizzlePlugin.plugin.plugin.getSwizzleConfig ??
+    swizzlePlugin.plugin.pluginModule?.module.getSwizzleConfig;
 
   if (getSwizzleConfig) {
     return getSwizzleConfig();
@@ -26,9 +25,8 @@ function getModuleSwizzleConfig(
 
   // TODO deprecate getSwizzleComponentList later
   const getSwizzleComponentList =
-    swizzlePlugin.plugin.plugin?.getSwizzleComponentList ??
-    swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList ??
-    swizzlePlugin.plugin.pluginModule?.module?.getSwizzleComponentList;
+    swizzlePlugin.plugin.plugin.getSwizzleComponentList ??
+    swizzlePlugin.plugin.pluginModule?.module.getSwizzleComponentList;
 
   if (getSwizzleComponentList) {
     const safeComponents = getSwizzleComponentList() ?? [];
diff --git a/packages/docusaurus/src/commands/swizzle/themes.ts b/packages/docusaurus/src/commands/swizzle/themes.ts
index c31b0f28dd8b..84961dd9716c 100644
--- a/packages/docusaurus/src/commands/swizzle/themes.ts
+++ b/packages/docusaurus/src/commands/swizzle/themes.ts
@@ -15,7 +15,7 @@ import {findStringIgnoringCase, type SwizzlePlugin} from './common';
 export function pluginToThemeName(plugin: SwizzlePlugin): string | undefined {
   if (plugin.instance.getThemePath) {
     return (
-      (plugin.instance.version as {name: string}).name ?? plugin.instance.name
+      (plugin.instance.version as {name?: string}).name ?? plugin.instance.name
     );
   }
   return undefined;
@@ -76,9 +76,7 @@ function handleInvalidThemeName({
   // TODO recover from short theme-names here: "classic" => "@docusaurus/theme-classic"
 
   // No recovery value is possible: print error
-  const suggestion = themeNames.find(
-    (name) => leven(name, themeNameParam!) < 4,
-  );
+  const suggestion = themeNames.find((name) => leven(name, themeNameParam) < 4);
   logger.error`Theme name=${themeNameParam} not found. ${
     suggestion
       ? logger.interpolate`Did you mean name=${suggestion}?`
@@ -87,13 +85,13 @@ function handleInvalidThemeName({
   return process.exit(1);
 }
 
-async function validateThemeName({
+function validateThemeName({
   themeNameParam,
   themeNames,
 }: {
   themeNameParam: string;
   themeNames: string[];
-}): Promise<string> {
+}): string {
   const isValidName = themeNames.includes(themeNameParam);
   if (!isValidName) {
     return handleInvalidThemeName({
diff --git a/packages/docusaurus/src/commands/writeHeadingIds.ts b/packages/docusaurus/src/commands/writeHeadingIds.ts
index fe15c0b1f3ef..73bc699c25b3 100644
--- a/packages/docusaurus/src/commands/writeHeadingIds.ts
+++ b/packages/docusaurus/src/commands/writeHeadingIds.ts
@@ -37,12 +37,12 @@ async function transformMarkdownFile(
 async function getPathsToWatch(siteDir: string): Promise<string[]> {
   const context = await loadContext({siteDir});
   const plugins = await initPlugins(context);
-  return plugins.flatMap((plugin) => plugin?.getPathsToWatch?.() ?? []);
+  return plugins.flatMap((plugin) => plugin.getPathsToWatch?.() ?? []);
 }
 
 export async function writeHeadingIds(
   siteDir: string,
-  files: string[],
+  files: string[] | undefined,
   options: WriteHeadingIDOptions,
 ): Promise<void> {
   const markdownFiles = await safeGlobby(
diff --git a/packages/docusaurus/src/deps.d.ts b/packages/docusaurus/src/deps.d.ts
index 06f478ca6330..57de485ea0ce 100644
--- a/packages/docusaurus/src/deps.d.ts
+++ b/packages/docusaurus/src/deps.d.ts
@@ -20,13 +20,13 @@ declare module 'react-loadable-ssr-addon-v5-slorber' {
   export type Manifest = {
     entrypoints: string[];
     origins: {[key: string]: number[]};
-    assets: Array<{[key: string]: Asset[]}>;
+    assets: {[key: string]: Asset[]}[];
   };
 
   export function getBundles(
     manifest: Manifest,
     modulesToBeLoaded: string[],
-  ): {js: Asset[]; css: Asset[]};
+  ): {js?: Asset[]; css?: Asset[]};
 
   export default class ReactLoadableSSRAddon implements WebpackPluginInstance {
     constructor(props: {filename: string});
diff --git a/packages/docusaurus/src/server/plugins/configs.ts b/packages/docusaurus/src/server/plugins/configs.ts
index b7b7bbf6ccd4..eb2898e5d312 100644
--- a/packages/docusaurus/src/server/plugins/configs.ts
+++ b/packages/docusaurus/src/server/plugins/configs.ts
@@ -63,7 +63,7 @@ async function normalizePluginConfig(
     const pluginPath = pluginRequire.resolve(pluginModuleImport);
     const pluginModule = importFresh<ImportedPluginModule>(pluginPath);
     return {
-      plugin: pluginModule?.default ?? pluginModule,
+      plugin: pluginModule.default ?? pluginModule,
       options: {},
       pluginModule: {
         path: pluginModuleImport,
@@ -90,7 +90,7 @@ async function normalizePluginConfig(
     const pluginPath = pluginRequire.resolve(pluginModuleImport);
     const pluginModule = importFresh<ImportedPluginModule>(pluginPath);
     return {
-      plugin: pluginModule?.default ?? pluginModule,
+      plugin: pluginModule.default ?? pluginModule,
       options: pluginConfig[1],
       pluginModule: {
         path: pluginModuleImport,
diff --git a/packages/docusaurus/src/server/plugins/index.ts b/packages/docusaurus/src/server/plugins/index.ts
index 812ea7b2e80e..5a8dbb98d095 100644
--- a/packages/docusaurus/src/server/plugins/index.ts
+++ b/packages/docusaurus/src/server/plugins/index.ts
@@ -52,7 +52,7 @@ export async function loadPlugins(context: LoadContext): Promise<{
     plugins.map(async (plugin) => {
       const content = await plugin.loadContent?.();
       const rawTranslationFiles =
-        (await plugin?.getTranslationFiles?.({content})) ?? [];
+        (await plugin.getTranslationFiles?.({content})) ?? [];
       const translationFiles = await Promise.all(
         rawTranslationFiles.map((translationFile) =>
           localizePluginTranslationFile({
diff --git a/packages/docusaurus/src/server/plugins/init.ts b/packages/docusaurus/src/server/plugins/init.ts
index 771a407cccb5..c19f82d15b80 100644
--- a/packages/docusaurus/src/server/plugins/init.ts
+++ b/packages/docusaurus/src/server/plugins/init.ts
@@ -29,8 +29,8 @@ function getOptionValidationFunction(
   if (normalizedPluginConfig.pluginModule) {
     // Support both CommonJS and ES modules
     return (
-      normalizedPluginConfig.pluginModule.module?.default?.validateOptions ??
-      normalizedPluginConfig.pluginModule.module?.validateOptions
+      normalizedPluginConfig.pluginModule.module.default?.validateOptions ??
+      normalizedPluginConfig.pluginModule.module.validateOptions
     );
   }
   return normalizedPluginConfig.plugin.validateOptions;
@@ -66,7 +66,7 @@ export async function initPlugins(
   ): Promise<PluginVersionInformation> {
     if (normalizedPluginConfig.pluginModule?.path) {
       const pluginPath = pluginRequire.resolve(
-        normalizedPluginConfig.pluginModule?.path,
+        normalizedPluginConfig.pluginModule.path,
       );
       return getPluginVersion(pluginPath, context.siteDir);
     }
diff --git a/packages/docusaurus/src/server/plugins/moduleShorthand.ts b/packages/docusaurus/src/server/plugins/moduleShorthand.ts
index df0ab5570d43..5a106e88fe30 100644
--- a/packages/docusaurus/src/server/plugins/moduleShorthand.ts
+++ b/packages/docusaurus/src/server/plugins/moduleShorthand.ts
@@ -14,7 +14,10 @@ export function getNamePatterns(
     if (!moduleName.includes('/')) {
       return [`${moduleName}/docusaurus-${moduleType}`];
     }
-    const [scope, packageName] = moduleName.split(/\/(?<rest>.*)/);
+    const [scope, packageName] = moduleName.split(/\/(?<rest>.*)/) as [
+      string,
+      string,
+    ];
     return [
       `${scope}/${packageName}`,
       `${scope}/docusaurus-${moduleType}-${packageName}`,
diff --git a/packages/docusaurus/src/server/plugins/routeConfig.ts b/packages/docusaurus/src/server/plugins/routeConfig.ts
index e9b7c589408f..3731eb993d74 100644
--- a/packages/docusaurus/src/server/plugins/routeConfig.ts
+++ b/packages/docusaurus/src/server/plugins/routeConfig.ts
@@ -50,8 +50,8 @@ export function sortConfig(
     }
     // Higher priority get placed first.
     if (a.priority || b.priority) {
-      const priorityA = a.priority || 0;
-      const priorityB = b.priority || 0;
+      const priorityA = a.priority ?? 0;
+      const priorityB = b.priority ?? 0;
       const score = priorityB - priorityA;
 
       if (score !== 0) {
diff --git a/packages/docusaurus/src/server/plugins/synthetic.ts b/packages/docusaurus/src/server/plugins/synthetic.ts
index 67e297ffe5f5..5d4fe38b4d01 100644
--- a/packages/docusaurus/src/server/plugins/synthetic.ts
+++ b/packages/docusaurus/src/server/plugins/synthetic.ts
@@ -89,7 +89,7 @@ export function createMDXFallbackPlugin({
       // processed by content plugins mdx loaders. This works, but a bit
       // hacky... Not sure there's a way to handle that differently in webpack
       function getMDXFallbackExcludedPaths(): string[] {
-        const rules: RuleSetRule[] = config?.module?.rules as RuleSetRule[];
+        const rules: RuleSetRule[] = config.module?.rules as RuleSetRule[];
         return rules.flatMap((rule) => {
           const isMDXRule =
             rule.test instanceof RegExp && rule.test.test('x.mdx');
diff --git a/packages/docusaurus/src/server/routes.ts b/packages/docusaurus/src/server/routes.ts
index ab97b1a7b9d7..b13c8cd9b11a 100644
--- a/packages/docusaurus/src/server/routes.ts
+++ b/packages/docusaurus/src/server/routes.ts
@@ -152,7 +152,7 @@ const isModule = (value: unknown): value is Module =>
   typeof value === 'string' ||
   (typeof value === 'object' &&
     // eslint-disable-next-line no-underscore-dangle
-    !!(value as {[key: string]: unknown})?.__import);
+    !!(value as {[key: string]: unknown} | null)?.__import);
 
 /**
  * Takes a {@link Module} (which is nothing more than a path plus some metadata
diff --git a/packages/docusaurus/src/server/translations/translationsExtractor.ts b/packages/docusaurus/src/server/translations/translationsExtractor.ts
index 6113b23ba933..83be6bcd7503 100644
--- a/packages/docusaurus/src/server/translations/translationsExtractor.ts
+++ b/packages/docusaurus/src/server/translations/translationsExtractor.ts
@@ -160,7 +160,7 @@ export async function extractSourceCodeFileTranslations(
       filename: sourceCodeFilePath,
     }) as Node;
 
-    const translations = await extractSourceCodeAstTranslations(
+    const translations = extractSourceCodeAstTranslations(
       ast,
       sourceCodeFilePath,
     );
@@ -243,9 +243,7 @@ Full code: ${generate(node).code}`;
             .find(
               (attr) =>
                 attr.isJSXAttribute() &&
-                (attr as NodePath<t.JSXAttribute>)
-                  .get('name')
-                  .isJSXIdentifier({name: propName}),
+                attr.get('name').isJSXIdentifier({name: propName}),
             );
 
           if (attributePath) {
diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index 4e00fecefaf1..0b66a8d539be 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -38,7 +38,7 @@ export function excludeJS(modulePath: string): boolean {
   }
   // Don't transpile node_modules except any docusaurus npm package
   return (
-    /node_modules/.test(modulePath) &&
+    modulePath.includes('node_modules') &&
     !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath) &&
     !LibrariesToTranspileRegex.test(modulePath)
   );
diff --git a/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts b/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts
index 5a8f4770102a..a87d2dcfda05 100644
--- a/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts
+++ b/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts
@@ -116,7 +116,7 @@ export default class CleanWebpackPlugin {
   }
 
   apply(compiler: Compiler): void {
-    if (!compiler.options.output || !compiler.options.output.path) {
+    if (!compiler.options.output.path) {
       console.warn(
         'clean-webpack-plugin: options.output.path not defined. Plugin disabled...',
       );
@@ -185,7 +185,7 @@ export default class CleanWebpackPlugin {
      * (relies on del's cwd: outputPath option)
      */
     const staleFiles = this.currentAssets.filter(
-      (previousAsset) => assets.includes(previousAsset) === false,
+      (previousAsset) => !assets.includes(previousAsset),
     );
 
     /**
@@ -198,7 +198,7 @@ export default class CleanWebpackPlugin {
     /**
      * Remove unused webpack assets
      */
-    if (this.cleanStaleWebpackAssets === true && staleFiles.length !== 0) {
+    if (this.cleanStaleWebpackAssets && staleFiles.length !== 0) {
       removePatterns.push(...staleFiles);
     }
 
@@ -234,10 +234,9 @@ export default class CleanWebpackPlugin {
         });
       }
     } catch (err) {
-      const needsForce =
-        /Cannot delete files\/folders outside the current working directory\./.test(
-          (err as Error).message,
-        );
+      const needsForce = (err as Error).message.includes(
+        'Cannot delete files/folders outside the current working directory.',
+      );
 
       if (needsForce) {
         const message =
diff --git a/packages/docusaurus/src/webpack/utils.ts b/packages/docusaurus/src/webpack/utils.ts
index 79362887679e..8a7d0aef6120 100644
--- a/packages/docusaurus/src/webpack/utils.ts
+++ b/packages/docusaurus/src/webpack/utils.ts
@@ -185,13 +185,11 @@ export function applyConfigureWebpack(
   if (typeof configureWebpack === 'function') {
     const {mergeStrategy, ...res} =
       configureWebpack(config, isServer, utils, content) ?? {};
-    if (res && typeof res === 'object') {
-      const customizeRules = mergeStrategy ?? {};
-      return mergeWithCustomize({
-        customizeArray: customizeArray(customizeRules),
-        customizeObject: customizeObject(customizeRules),
-      })(config, res);
-    }
+    const customizeRules = mergeStrategy ?? {};
+    return mergeWithCustomize({
+      customizeArray: customizeArray(customizeRules),
+      customizeObject: customizeObject(customizeRules),
+    })(config, res);
   }
   return config;
 }
@@ -243,7 +241,7 @@ export function compile(config: Configuration[]): Promise<void> {
     const compiler = webpack(config);
     compiler.run((err, stats) => {
       if (err) {
-        logger.error(err.stack || err);
+        logger.error(err.stack ?? err);
         if (err.details) {
           logger.error(err.details);
         }
diff --git a/packages/lqip-loader/src/index.ts b/packages/lqip-loader/src/index.ts
index 6bb0eb526240..5dd78269439c 100644
--- a/packages/lqip-loader/src/index.ts
+++ b/packages/lqip-loader/src/index.ts
@@ -17,9 +17,7 @@ export default async function lqipLoader(
   this: LoaderContext<Options>,
   contentBuffer: Buffer,
 ): Promise<void> {
-  if (this.cacheable) {
-    this.cacheable();
-  }
+  this.cacheable();
   const callback = this.async();
   const imgPath = this.resourcePath;
   let content = contentBuffer.toString('utf8');
diff --git a/packages/stylelint-copyright/src/index.ts b/packages/stylelint-copyright/src/index.ts
index a620d184d0a0..0b591561ea0e 100644
--- a/packages/stylelint-copyright/src/index.ts
+++ b/packages/stylelint-copyright/src/index.ts
@@ -27,7 +27,8 @@ const plugin = stylelint.createPlugin(
         },
         {
           actual: secondaryOption,
-          possible: (v) => typeof (v as SecondaryOption)?.header === 'string',
+          possible: (v) =>
+            typeof (v as SecondaryOption | undefined)?.header === 'string',
         },
       );
 
@@ -42,7 +43,7 @@ const plugin = stylelint.createPlugin(
         }
       }
       if (context.fix) {
-        root.first?.before(`/*${secondaryOption.header}\n */`);
+        root.first?.before(`/*${secondaryOption.header!}\n */`);
         return;
       }
 
diff --git a/website/_dogfooding/docs-tests-sidebars.js b/website/_dogfooding/docs-tests-sidebars.js
index 6b8b8f9c4365..e7ebb55ce1a5 100644
--- a/website/_dogfooding/docs-tests-sidebars.js
+++ b/website/_dogfooding/docs-tests-sidebars.js
@@ -5,7 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+/**
+ * @typedef {import('@docusaurus/plugin-content-docs').SidebarsConfig} SidebarsConfig
+ * @typedef {import('@docusaurus/plugin-content-docs/lib/sidebars/types').SidebarItemConfig} SidebarItemConfig
+ */
+
+/** @type {SidebarsConfig} */
 const sidebars = {
   sidebar: [
     {
@@ -119,6 +124,11 @@ function generateHugeSidebarItems() {
   const linksCount = 8;
   const categoriesCount = 8;
 
+  /**
+   * @param {number} maxLevel
+   * @param {number} currentLevel
+   * @returns {SidebarItemConfig[]}
+   */
   function generateRecursive(maxLevel, currentLevel = 0) {
     if (currentLevel === maxLevel) {
       return [
@@ -130,17 +140,19 @@ function generateHugeSidebarItems() {
       ];
     }
 
-    const linkItems = [...Array(linksCount).keys()].map((index) => ({
+    const linkItems = Array.from(Array(linksCount).keys()).map((index) => ({
       type: 'link',
       href: '/',
       label: `Link ${index} (level ${currentLevel + 1})`,
     }));
 
-    const categoryItems = [...Array(categoriesCount).keys()].map((index) => ({
-      type: 'category',
-      label: `Category ${index} (level ${currentLevel + 1})`,
-      items: generateRecursive(maxLevel, currentLevel + 1),
-    }));
+    const categoryItems = Array.from(Array(categoriesCount).keys()).map(
+      (index) => ({
+        type: 'category',
+        label: `Category ${index} (level ${currentLevel + 1})`,
+        items: generateRecursive(maxLevel, currentLevel + 1),
+      }),
+    );
 
     return [...linkItems, ...categoryItems];
   }
diff --git a/website/_dogfooding/testSwizzleThemeClassic.mjs b/website/_dogfooding/testSwizzleThemeClassic.mjs
index ab75a7d1dafb..6f635bea5718 100644
--- a/website/_dogfooding/testSwizzleThemeClassic.mjs
+++ b/website/_dogfooding/testSwizzleThemeClassic.mjs
@@ -10,15 +10,16 @@ import fs from 'fs-extra';
 import {fileURLToPath} from 'url';
 import logger from '@docusaurus/logger';
 
-import ClassicTheme from '@docusaurus/theme-classic';
+import classicTheme from '@docusaurus/theme-classic';
 
 // Unsafe imports
 import {readComponentNames} from '@docusaurus/core/lib/commands/swizzle/components.js';
 import {normalizeSwizzleConfig} from '@docusaurus/core/lib/commands/swizzle/config.js';
 import {wrap, eject} from '@docusaurus/core/lib/commands/swizzle/actions.js';
 
-const swizzleConfig = normalizeSwizzleConfig(ClassicTheme.getSwizzleConfig());
+const swizzleConfig = normalizeSwizzleConfig(classicTheme.getSwizzleConfig());
 
+/** @type {"eject" | "wrap"} */
 const action = process.env.SWIZZLE_ACTION ?? 'eject';
 const typescript = process.env.SWIZZLE_TYPESCRIPT === 'true';
 
@@ -81,14 +82,12 @@ if (action === 'wrap') {
   });
 }
 
+/**
+ * @param {string} componentName
+ */
 function getActionStatus(componentName) {
   const actionStatus =
     swizzleConfig.components[componentName]?.actions[action] ?? 'unsafe';
-  if (!actionStatus) {
-    throw new Error(
-      `Unexpected: missing action ${action} for ${componentName}`,
-    );
-  }
   return actionStatus;
 }
 
diff --git a/website/delayCrowdin.mjs b/website/delayCrowdin.mjs
index d212e0e7c9a0..2fbb232c2f47 100644
--- a/website/delayCrowdin.mjs
+++ b/website/delayCrowdin.mjs
@@ -13,6 +13,9 @@ And then both try to dl the translations at the same time, and then we have a
 Used in conjunction with waitForCrowdin.js (which is not enough)
  */
 
+/**
+ * @param {number} ms
+ */
 async function delay(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 4fe18ec4dfb3..6885a87f8667 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -49,7 +49,7 @@ const isDeployPreview =
 // Used to debug production build issues faster
 const isBuildFast = !!process.env.BUILD_FAST;
 
-const baseUrl = process.env.BASE_URL || '/';
+const baseUrl = process.env.BASE_URL ?? '/';
 
 // Special deployment for staging locales until they get enough translations
 // https://app.netlify.com/sites/docusaurus-i18n-staging
diff --git a/website/src/components/APITable/index.tsx b/website/src/components/APITable/index.tsx
index fb2e69366fde..b6a73d2862cf 100644
--- a/website/src/components/APITable/index.tsx
+++ b/website/src/components/APITable/index.tsx
@@ -68,8 +68,8 @@ const APITableRowComp = React.forwardRef(APITableRow);
  */
 export default function APITable({children, name}: Props): JSX.Element {
   const [thead, tbody] = React.Children.toArray(children.props.children) as [
-    ReactElement,
-    ReactElement,
+    ReactElement<{children: ReactElement[]}>,
+    ReactElement<{children: ReactElement[]}>,
   ];
   const highlightedRow = useRef<HTMLTableRowElement>(null);
   useEffect(() => {
diff --git a/website/src/components/ColorGenerator/index.tsx b/website/src/components/ColorGenerator/index.tsx
index 87e68c528682..7fbcdfa03b60 100644
--- a/website/src/components/ColorGenerator/index.tsx
+++ b/website/src/components/ColorGenerator/index.tsx
@@ -59,7 +59,9 @@ export default function ColorGenerator(): JSX.Element {
 
   // Switch modes -> update state by stored values
   useEffect(() => {
-    const storedValues: ColorState = JSON.parse(storage.get() ?? '{}');
+    const storedValues = JSON.parse(
+      storage.get() ?? '{}',
+    ) as Partial<ColorState>;
     setInputColor(storedValues.baseColor ?? DEFAULT_PRIMARY_COLOR);
     setBaseColor(storedValues.baseColor ?? DEFAULT_PRIMARY_COLOR);
     setBackground(storedValues.background ?? DEFAULT_BACKGROUND_COLOR);
diff --git a/website/src/components/TeamProfileCards/index.tsx b/website/src/components/TeamProfileCards/index.tsx
index 92b6858df745..d1b3d506291b 100644
--- a/website/src/components/TeamProfileCards/index.tsx
+++ b/website/src/components/TeamProfileCards/index.tsx
@@ -12,7 +12,7 @@ import Link from '@docusaurus/Link';
 function WebsiteLink({to, children}: {to: string; children?: ReactNode}) {
   return (
     <Link to={to}>
-      {children || (
+      {children ?? (
         <Translate id="team.profile.websiteLinkLabel">website</Translate>
       )}
     </Link>
@@ -23,7 +23,7 @@ type ProfileProps = {
   className?: string;
   name: string;
   children: ReactNode;
-  githubUrl?: string;
+  githubUrl: string;
   twitterUrl?: string;
 };
 
diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx
index 6937b6da4ed2..00903c3c7b60 100644
--- a/website/src/pages/index.tsx
+++ b/website/src/pages/index.tsx
@@ -99,7 +99,7 @@ function MigrationAnnouncement() {
 }
 
 function TweetsSection() {
-  const tweetColumns: Array<Array<TweetItem>> = [[], [], []];
+  const tweetColumns: TweetItem[][] = [[], [], []];
   Tweets.filter((tweet) => tweet.showOnHomepage).forEach((tweet, i) =>
     tweetColumns[i % 3]!.push(tweet),
   );
diff --git a/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx b/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx
index acb4516d111f..aaada5d7618f 100644
--- a/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx
+++ b/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx
@@ -35,7 +35,7 @@ export default function ShowcaseFilterToggle(): JSX.Element {
     const searchParams = new URLSearchParams(location.search);
     searchParams.delete(OperatorQueryKey);
     if (!operator) {
-      searchParams.append(OperatorQueryKey, operator ? 'OR' : 'AND');
+      searchParams.append(OperatorQueryKey, 'AND');
     }
     history.push({
       ...location,
diff --git a/website/src/pages/showcase/_components/ShowcaseTooltip/index.tsx b/website/src/pages/showcase/_components/ShowcaseTooltip/index.tsx
index bcbf5b4709b8..7087fa0e5d2d 100644
--- a/website/src/pages/showcase/_components/ShowcaseTooltip/index.tsx
+++ b/website/src/pages/showcase/_components/ShowcaseTooltip/index.tsx
@@ -14,7 +14,6 @@ interface Props {
   anchorEl?: HTMLElement | string;
   id: string;
   text: string;
-  delay?: number;
   children: React.ReactElement;
 }
 
@@ -23,7 +22,6 @@ export default function Tooltip({
   id,
   anchorEl,
   text,
-  delay,
 }: Props): JSX.Element {
   const [open, setOpen] = useState(false);
   const [referenceElement, setReferenceElement] = useState<HTMLElement | null>(
@@ -84,7 +82,7 @@ export default function Tooltip({
 
       timeout.current = window.setTimeout(() => {
         setOpen(true);
-      }, delay || 400);
+      }, 400);
     };
 
     const handleClose = () => {
@@ -113,7 +111,7 @@ export default function Tooltip({
         });
       }
     };
-  }, [referenceElement, text, delay]);
+  }, [referenceElement, text]);
 
   return (
     <>
diff --git a/website/src/pages/versions.tsx b/website/src/pages/versions.tsx
index 9db0ec5d10ee..4a65419b8837 100644
--- a/website/src/pages/versions.tsx
+++ b/website/src/pages/versions.tsx
@@ -58,38 +58,35 @@ export default function Version(): JSX.Element {
           </Translate>
         </Heading>
 
-        {latestVersion && (
-          <div className="margin-bottom--lg">
-            <Heading as="h3" id="next">
-              <Translate id="versionsPage.current.title">
-                Current version (Stable)
-              </Translate>
-            </Heading>
-            <p>
-              <Translate id="versionsPage.current.description">
-                Here you can find the documentation for current released
-                version.
-              </Translate>
-            </p>
-            <table>
-              <tbody>
-                <tr>
-                  <th>{latestVersion.label}</th>
-                  <td>
-                    <Link to={latestVersion.path}>
-                      <DocumentationLabel />
-                    </Link>
-                  </td>
-                  <td>
-                    <a href={`${repoUrl}/releases/tag/v${latestVersion.name}`}>
-                      <ReleaseNotesLabel />
-                    </a>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        )}
+        <div className="margin-bottom--lg">
+          <Heading as="h3" id="next">
+            <Translate id="versionsPage.current.title">
+              Current version (Stable)
+            </Translate>
+          </Heading>
+          <p>
+            <Translate id="versionsPage.current.description">
+              Here you can find the documentation for current released version.
+            </Translate>
+          </p>
+          <table>
+            <tbody>
+              <tr>
+                <th>{latestVersion.label}</th>
+                <td>
+                  <Link to={latestVersion.path}>
+                    <DocumentationLabel />
+                  </Link>
+                </td>
+                <td>
+                  <a href={`${repoUrl}/releases/tag/v${latestVersion.name}`}>
+                    <ReleaseNotesLabel />
+                  </a>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
 
         {currentVersion !== latestVersion && (
           <div className="margin-bottom--lg">
diff --git a/website/src/theme/ColorModeToggle.tsx b/website/src/theme/ColorModeToggle.tsx
index 44f81a00ff66..85e886bc75b8 100644
--- a/website/src/theme/ColorModeToggle.tsx
+++ b/website/src/theme/ColorModeToggle.tsx
@@ -32,7 +32,9 @@ export default function ColorModeToggle(props: Props): JSX.Element {
         props.onChange(colorMode);
         const isDarkMode = colorMode === 'dark';
         const storage = isDarkMode ? darkStorage : lightStorage;
-        const colorState: ColorState = JSON.parse(storage.get() ?? 'null') ?? {
+        const colorState = (JSON.parse(
+          storage.get() ?? 'null',
+        ) as ColorState | null) ?? {
           baseColor: isDarkMode ? DARK_PRIMARY_COLOR : LIGHT_PRIMARY_COLOR,
           background: isDarkMode
             ? DARK_BACKGROUND_COLOR
diff --git a/website/testCSSOrder.mjs b/website/testCSSOrder.mjs
index 9594c9ab3286..62422e3d4ea8 100644
--- a/website/testCSSOrder.mjs
+++ b/website/testCSSOrder.mjs
@@ -84,9 +84,14 @@ if (missingCSSMarkers.length > 0) {
 }
 
 // https://github.com/you-dont-need/You-Dont-Need-Lodash-Underscore#_sortby-and-_orderby
-const sortBy = (key) => (a, b) =>
-  // eslint-disable-next-line no-nested-ternary
-  a[key] > b[key] ? 1 : b[key] > a[key] ? -1 : 0;
+const sortBy =
+  (/** @type {string} */ key) =>
+  (
+    /** @type {Record<string, unknown>} */ a,
+    /** @type {Record<string, unknown>} */ b,
+  ) =>
+    // eslint-disable-next-line no-nested-ternary
+    a[key] > b[key] ? 1 : b[key] > a[key] ? -1 : 0;
 
 const sortedCSSMarkers = [...cssMarkersWithPositions]
   .sort(sortBy('position'))
diff --git a/website/waitForCrowdin.mjs b/website/waitForCrowdin.mjs
index d8e2823b5008..7a02bf0a4ed6 100644
--- a/website/waitForCrowdin.mjs
+++ b/website/waitForCrowdin.mjs
@@ -28,6 +28,9 @@ const token = process.env.CROWDIN_PERSONAL_TOKEN; // Set on Netlify
 
 const translations = new Translations({token});
 
+/**
+ * @param {number} ms
+ */
 async function delay(ms) {
   return new Promise((resolve) => {
     setTimeout(resolve, ms);

From 624735bd92a82724e4fc18239d42e160726af506 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Tue, 24 May 2022 19:19:24 +0800
Subject: [PATCH 04/43] refactor: fix more type-aware linting errors (#7479)

---
 .eslintrc.js                                  |   4 +-
 admin/scripts/generateExamples.js             |   7 +-
 packages/create-docusaurus/bin/index.js       |   4 +-
 packages/create-docusaurus/src/index.ts       |   2 +-
 packages/docusaurus-migrate/bin/index.mjs     |   6 +-
 .../src/index.d.ts                            |  13 ++-
 .../src/__tests__/feed.test.ts                |   4 +-
 .../docusaurus-plugin-content-docs/src/cli.ts |  10 +-
 .../src/versions/files.ts                     |   2 +-
 .../docusaurus-theme-classic/src/index.ts     |   5 +-
 .../src/theme-classic.d.ts                    |   3 +-
 .../src/theme/MDXComponents/Details.tsx       |   8 +-
 .../src/theme/MDXComponents/Head.tsx          |   8 +-
 .../src/theme/MDXComponents/Pre.tsx           |   4 +-
 .../src/theme/Navbar/Content/index.tsx        |   3 +-
 .../MobileSidebar/PrimaryMenu/index.tsx       |   3 +-
 .../DocsVersionDropdownNavbarItem.tsx         |   4 +-
 .../theme/NavbarItem/DropdownNavbarItem.tsx   |   3 +-
 .../src/theme/NavbarItem/index.tsx            |  27 ++---
 .../src/theme/Tabs/index.tsx                  |   6 +-
 .../src/components/Details/index.tsx          |   2 +-
 .../src/hooks/useTOCHighlight.ts              |   2 +-
 .../src/utils/codeBlockUtils.ts               |   6 +-
 .../src/utils/useThemeConfig.ts               |   6 +-
 .../src/theme/Playground/index.tsx            |   2 +-
 .../src/theme/SearchBar/index.tsx             |   2 +-
 .../locales/__tests__/locales.test.ts         |   6 +-
 .../src/index.ts                              |   2 +-
 .../src/__tests__/pathUtils.test.ts           |  30 +++--
 packages/docusaurus/bin/beforeCli.mjs         |   4 +-
 .../src/client/ClientLifecyclesDispatcher.tsx |   2 +-
 .../src/client/__tests__/flat.test.ts         |   2 +-
 packages/docusaurus/src/client/docusaurus.ts  |   2 +-
 .../docusaurus/src/client/exports/Link.tsx    |   5 +-
 .../exports/__tests__/useGlobalData.test.tsx  |  13 ---
 .../src/client/exports/isInternalUrl.ts       |   2 +-
 .../src/client/exports/useGlobalData.ts       |   3 -
 packages/docusaurus/src/client/flat.ts        |   2 +-
 packages/docusaurus/src/client/prefetch.ts    |   4 +-
 .../docusaurus/src/client/serverEntry.tsx     |   4 +-
 .../configValidation.test.ts.snap             |  16 +--
 .../docusaurus/src/server/configValidation.ts |   8 +-
 packages/docusaurus/src/server/htmlTags.ts    |   2 +-
 .../__tests__/__snapshots__/init.test.ts.snap |   4 +-
 .../src/server/plugins/__tests__/init.test.ts |   2 +-
 .../translations/translationsExtractor.ts     |   6 +-
 packages/docusaurus/src/webpack/utils.ts      |   2 +-
 packages/lqip-loader/src/index.ts             |   7 +-
 .../src/__tests__/index.test.ts               | 110 +++++++++---------
 tsconfig.json                                 |   1 +
 website/src/pages/versions.tsx                |   2 +-
 51 files changed, 195 insertions(+), 192 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 4dc985f0d9f9..051366201728 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -83,7 +83,7 @@ module.exports = {
     'no-restricted-exports': OFF,
     'no-restricted-properties': [
       ERROR,
-      ...[
+      .../** @type {[string, string][]} */ ([
         // TODO: TS doesn't make Boolean a narrowing function yet,
         // so filter(Boolean) is problematic type-wise
         // ['compact', 'Array#filter(Boolean)'],
@@ -114,7 +114,7 @@ module.exports = {
         ['take', 'Array#slice(0, n)'],
         ['takeRight', 'Array#slice(-n)'],
         ['tail', 'Array#slice(1)'],
-      ].map(([property, alternative]) => ({
+      ]).map(([property, alternative]) => ({
         object: '_',
         property,
         message: `Use ${alternative} instead.`,
diff --git a/admin/scripts/generateExamples.js b/admin/scripts/generateExamples.js
index de99e750490b..59020d821d09 100644
--- a/admin/scripts/generateExamples.js
+++ b/admin/scripts/generateExamples.js
@@ -44,9 +44,10 @@ async function generateTemplateExample(template) {
       `npm init docusaurus@latest examples/${template} ${command}`,
     );
 
-    const templatePackageJson = await fs.readJSON(
-      `examples/${template}/package.json`,
-    );
+    const templatePackageJson =
+      await /** @type {Promise<import("../../packages/create-docusaurus/templates/classic/package.json") & { scripts: { [name: string]: string }; description: string }>} */ (
+        fs.readJSON(`examples/${template}/package.json`)
+      );
 
     // Attach the dev script which would be used in code sandbox by default
     templatePackageJson.scripts.dev = 'docusaurus start';
diff --git a/packages/create-docusaurus/bin/index.js b/packages/create-docusaurus/bin/index.js
index 328495345270..35e135ebc65c 100755
--- a/packages/create-docusaurus/bin/index.js
+++ b/packages/create-docusaurus/bin/index.js
@@ -14,7 +14,9 @@ import logger from '@docusaurus/logger';
 import semver from 'semver';
 import {program} from 'commander';
 
-const packageJson = createRequire(import.meta.url)('../package.json');
+const packageJson = /** @type {import("../package.json")} */ (
+  createRequire(import.meta.url)('../package.json')
+);
 const requiredVersion = packageJson.engines.node;
 
 if (!semver.satisfies(process.version, requiredVersion)) {
diff --git a/packages/create-docusaurus/src/index.ts b/packages/create-docusaurus/src/index.ts
index 6523b9291766..27d53f50fd59 100755
--- a/packages/create-docusaurus/src/index.ts
+++ b/packages/create-docusaurus/src/index.ts
@@ -78,7 +78,7 @@ async function askForPackageManagerChoice(): Promise<PackageManager> {
             logger.info`Falling back to name=${defaultPackageManager}`;
           },
         },
-      )) as {packageManager: PackageManager}
+      )) as {packageManager?: PackageManager}
     ).packageManager ?? defaultPackageManager
   );
 }
diff --git a/packages/docusaurus-migrate/bin/index.mjs b/packages/docusaurus-migrate/bin/index.mjs
index 769c5e9e3c08..0ace2050c1ca 100755
--- a/packages/docusaurus-migrate/bin/index.mjs
+++ b/packages/docusaurus-migrate/bin/index.mjs
@@ -15,7 +15,9 @@ import semver from 'semver';
 import cli from 'commander';
 
 const moduleRequire = createRequire(import.meta.url);
-const requiredVersion = moduleRequire('../package.json').engines.node;
+const requiredVersion = /** @type {import("../package.json")} */ (
+  moduleRequire('../package.json')
+).engines.node;
 
 if (!semver.satisfies(process.version, requiredVersion)) {
   logger.error('Minimum Node.js version not met :(');
@@ -25,7 +27,7 @@ if (!semver.satisfies(process.version, requiredVersion)) {
 
 // See https://github.com/facebook/docusaurus/pull/6860
 const {migrateDocusaurusProject, migrateMDToMDX} =
-  moduleRequire('../lib/index.js');
+  /** @type {import("../lib/index.js")} */ (moduleRequire('../lib/index.js'));
 
 cli
   .command('migrate [siteDir] [newDir]')
diff --git a/packages/docusaurus-module-type-aliases/src/index.d.ts b/packages/docusaurus-module-type-aliases/src/index.d.ts
index cd6bf0d1c910..3a900c907d77 100644
--- a/packages/docusaurus-module-type-aliases/src/index.d.ts
+++ b/packages/docusaurus-module-type-aliases/src/index.d.ts
@@ -323,16 +323,27 @@ declare module '@docusaurus/renderRoutes' {
 declare module '@docusaurus/useGlobalData' {
   import type {GlobalData, UseDataOptions} from '@docusaurus/types';
 
+  export function useAllPluginInstancesData(
+    pluginName: string,
+    options: {failfast: true},
+  ): GlobalData[string];
+
   export function useAllPluginInstancesData(
     pluginName: string,
     options?: UseDataOptions,
   ): GlobalData[string] | undefined;
 
+  export function usePluginData(
+    pluginName: string,
+    pluginId: string | undefined,
+    options: {failfast: true},
+  ): NonNullable<GlobalData[string][string]>;
+
   export function usePluginData(
     pluginName: string,
     pluginId?: string,
     options?: UseDataOptions,
-  ): GlobalData[string][string] | undefined;
+  ): GlobalData[string][string];
 
   export default function useGlobalData(): GlobalData;
 }
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
index 7b7981985443..2e5d96872dfe 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
@@ -133,7 +133,9 @@ describe.each(['atom', 'rss', 'json'])('%s', (feedType) => {
       } as PluginOptions,
     );
 
-    expect(fsMock.mock.calls.map((call) => call[1])).toMatchSnapshot();
+    expect(
+      fsMock.mock.calls.map((call) => call[1] as string),
+    ).toMatchSnapshot();
     fsMock.mockClear();
   });
 });
diff --git a/packages/docusaurus-plugin-content-docs/src/cli.ts b/packages/docusaurus-plugin-content-docs/src/cli.ts
index 7156d4c6e49a..65e4984affa0 100644
--- a/packages/docusaurus-plugin-content-docs/src/cli.ts
+++ b/packages/docusaurus-plugin-content-docs/src/cli.ts
@@ -14,6 +14,7 @@ import {
   getVersionDocsDirPath,
   getVersionSidebarsPath,
   getDocsDirPathLocalized,
+  readVersionsFile,
 } from './versions/files';
 import {validateVersionName} from './versions/validation';
 import {loadSidebarsFileUnsafe} from './sidebars';
@@ -69,12 +70,7 @@ export async function cliDocsVersionCommand(
     throw err;
   }
 
-  // Load existing versions.
-  let versions: string[] = [];
-  const versionsJSONFile = getVersionsFilePath(siteDir, pluginId);
-  if (await fs.pathExists(versionsJSONFile)) {
-    versions = await fs.readJSON(versionsJSONFile);
-  }
+  const versions = (await readVersionsFile(siteDir, pluginId)) ?? [];
 
   // Check if version already exists.
   if (versions.includes(version)) {
@@ -137,7 +133,7 @@ export async function cliDocsVersionCommand(
   // Update versions.json file.
   versions.unshift(version);
   await fs.outputFile(
-    versionsJSONFile,
+    getVersionsFilePath(siteDir, pluginId),
     `${JSON.stringify(versions, null, 2)}\n`,
   );
 
diff --git a/packages/docusaurus-plugin-content-docs/src/versions/files.ts b/packages/docusaurus-plugin-content-docs/src/versions/files.ts
index f9ef69c82944..04c97efaebaa 100644
--- a/packages/docusaurus-plugin-content-docs/src/versions/files.ts
+++ b/packages/docusaurus-plugin-content-docs/src/versions/files.ts
@@ -89,7 +89,7 @@ export function getVersionsFilePath(siteDir: string, pluginId: string): string {
  * @throws Throws if validation fails, i.e. `versions.json` doesn't contain an
  * array of valid version names.
  */
-async function readVersionsFile(
+export async function readVersionsFile(
   siteDir: string,
   pluginId: string,
 ): Promise<string[] | null> {
diff --git a/packages/docusaurus-theme-classic/src/index.ts b/packages/docusaurus-theme-classic/src/index.ts
index c87fef7f4b7e..b52f14d98b57 100644
--- a/packages/docusaurus-theme-classic/src/index.ts
+++ b/packages/docusaurus-theme-classic/src/index.ts
@@ -19,8 +19,9 @@ import type webpack from 'webpack';
 const requireFromDocusaurusCore = createRequire(
   require.resolve('@docusaurus/core/package.json'),
 );
-const ContextReplacementPlugin: typeof webpack.ContextReplacementPlugin =
-  requireFromDocusaurusCore('webpack/lib/ContextReplacementPlugin');
+const ContextReplacementPlugin = requireFromDocusaurusCore(
+  'webpack/lib/ContextReplacementPlugin',
+) as typeof webpack.ContextReplacementPlugin;
 
 // Need to be inlined to prevent dark mode FOUC
 // Make sure the key is the same as the one in `/theme/hooks/useTheme.js`
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 4aa679bd4946..bc9b9c9bbaf3 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -816,7 +816,6 @@ declare module '@theme/NavbarItem/NavbarNavLink' {
 
 declare module '@theme/NavbarItem/DropdownNavbarItem' {
   import type {Props as NavbarNavLinkProps} from '@theme/NavbarItem/NavbarNavLink';
-
   import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem';
 
   export type DesktopOrMobileNavBarItemProps = NavbarNavLinkProps & {
@@ -976,7 +975,7 @@ declare module '@theme/NavbarItem' {
         } & SearchNavbarItemProps)
     );
 
-  export type Types = Props['type'];
+  export type NavbarItemType = Props['type'];
 
   export default function NavbarItem(props: Props): JSX.Element;
 }
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx
index 8ae874a7a23e..c99fdc2a6adb 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx
@@ -10,11 +10,13 @@ import Details from '@theme/Details';
 import type {Props} from '@theme/MDXComponents/Details';
 
 export default function MDXDetails(props: Props): JSX.Element {
-  const items = React.Children.toArray(props.children) as ReactElement[];
+  const items = React.Children.toArray(props.children);
   // Split summary item from the rest to pass it as a separate prop to the
   // Details theme component
-  const summary: ReactElement<ComponentProps<'summary'>> | undefined =
-    items.find((item) => item?.props?.mdxType === 'summary');
+  const summary = items.find(
+    (item): item is ReactElement<ComponentProps<'summary'>> =>
+      React.isValidElement(item) && item.props?.mdxType === 'summary',
+  );
   const children = <>{items.filter((item) => item !== summary)}</>;
 
   return (
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx
index c21608e69e36..bf8867f409ba 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx
@@ -11,8 +11,10 @@ import type {Props} from '@theme/MDXComponents/Head';
 
 // MDX elements are wrapped through the MDX pragma. In some cases (notably usage
 // with Head/Helmet) we need to unwrap those elements.
-function unwrapMDXElement(element: ReactElement) {
-  if (element?.props?.mdxType && element?.props?.originalType) {
+function unwrapMDXElement(
+  element: ReactElement<{mdxType?: string; originalType?: string} | undefined>,
+) {
+  if (element.props?.mdxType && element.props.originalType) {
     const {mdxType, originalType, ...newProps} = element.props;
     return React.createElement(element.props.originalType, newProps);
   }
@@ -21,7 +23,7 @@ function unwrapMDXElement(element: ReactElement) {
 
 export default function MDXHead(props: Props): JSX.Element {
   const unwrappedChildren = React.Children.map(props.children, (child) =>
-    unwrapMDXElement(child as ReactElement),
+    React.isValidElement(child) ? unwrapMDXElement(child) : child,
   );
   return (
     <Head {...(props as ComponentProps<typeof Head>)}>{unwrappedChildren}</Head>
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx
index bfaf413fd04b..75e64c997171 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx
@@ -14,8 +14,8 @@ export default function MDXPre(props: Props): JSX.Element {
     <CodeBlock
       // If this pre is created by a ``` fenced codeblock, unwrap the children
       {...(isValidElement(props.children) &&
-      props.children.props.originalType === 'code'
-        ? props.children?.props
+      props.children.props?.originalType === 'code'
+        ? props.children.props
         : {...props})}
     />
   );
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 89503a675dcb..cf087e6cefd5 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
@@ -11,13 +11,12 @@ import {
   useNavbarMobileSidebar,
   useThemeConfig,
 } from '@docusaurus/theme-common';
-import NavbarItem from '@theme/NavbarItem';
+import NavbarItem, {type Props as NavbarItemConfig} from '@theme/NavbarItem';
 import NavbarColorModeToggle from '@theme/Navbar/ColorModeToggle';
 import SearchBar from '@theme/SearchBar';
 import NavbarMobileSidebarToggle from '@theme/Navbar/MobileSidebar/Toggle';
 import NavbarLogo from '@theme/Navbar/Logo';
 import NavbarSearch from '@theme/Navbar/Search';
-import type {Props as NavbarItemConfig} from '@theme/NavbarItem';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/PrimaryMenu/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/PrimaryMenu/index.tsx
index d8fa6524a6f0..3fec36ad617d 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/PrimaryMenu/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/PrimaryMenu/index.tsx
@@ -7,8 +7,7 @@
 
 import React from 'react';
 import {useNavbarMobileSidebar, useThemeConfig} from '@docusaurus/theme-common';
-import NavbarItem from '@theme/NavbarItem';
-import type {Props as NavbarItemConfig} from '@theme/NavbarItem';
+import NavbarItem, {type Props as NavbarItemConfig} from '@theme/NavbarItem';
 
 function useNavbarItems() {
   // TODO temporary casting until ThemeConfig type is improved
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
index b351eeeef1a8..47903ce0aa35 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
@@ -38,13 +38,13 @@ export default function DocsVersionDropdownNavbarItem({
     // We try to link to the same doc, in another version
     // When not possible, fallback to the "main doc" of the version
     const versionDoc =
-      activeDocContext?.alternateDocVersions[version.name] ??
+      activeDocContext.alternateDocVersions[version.name] ??
       getVersionMainDoc(version);
     return {
       isNavLink: true,
       label: version.label,
       to: versionDoc.path,
-      isActive: () => version === activeDocContext?.activeVersion,
+      isActive: () => version === activeDocContext.activeVersion,
       onClick: () => savePreferredVersionName(version.name),
     };
   });
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
index ca5e03d92f12..45c61dac60e7 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
@@ -15,12 +15,11 @@ import {
   useLocalPathname,
 } from '@docusaurus/theme-common';
 import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
-import NavbarItem from '@theme/NavbarItem';
+import NavbarItem, {type LinkLikeNavbarItemProps} from '@theme/NavbarItem';
 import type {
   DesktopOrMobileNavBarItemProps,
   Props,
 } from '@theme/NavbarItem/DropdownNavbarItem';
-import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem';
 
 const dropdownLinkActiveClass = 'dropdown__link--active';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx
index ca3253143a16..0096e2bdb1e3 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx
@@ -7,31 +7,22 @@
 
 import React from 'react';
 import ComponentTypes from '@theme/NavbarItem/ComponentTypes';
-import {type Props as DropdownNavbarItemProps} from '@theme/NavbarItem/DropdownNavbarItem';
-import type {Types, Props} from '@theme/NavbarItem';
+import type {NavbarItemType, Props} from '@theme/NavbarItem';
 
-const getNavbarItemComponent = (type: NonNullable<Types>) => {
-  const component = ComponentTypes[type];
-  if (!component) {
-    throw new Error(`No NavbarItem component found for type "${type}".`);
-  }
-  return component;
-};
-
-function getComponentType(type: Types, isDropdown: boolean) {
+function normalizeComponentType(type: NavbarItemType, props: object) {
   // Backward compatibility: navbar item with no type set
   // but containing dropdown items should use the type "dropdown"
   if (!type || type === 'default') {
-    return isDropdown ? 'dropdown' : 'default';
+    return 'items' in props ? 'dropdown' : 'default';
   }
-  return type as NonNullable<Types>;
+  return type;
 }
 
 export default function NavbarItem({type, ...props}: Props): JSX.Element {
-  const componentType = getComponentType(
-    type,
-    (props as DropdownNavbarItemProps).items !== undefined,
-  );
-  const NavbarItemComponent = getNavbarItemComponent(componentType);
+  const componentType = normalizeComponentType(type, props);
+  const NavbarItemComponent = ComponentTypes[componentType];
+  if (!NavbarItemComponent) {
+    throw new Error(`No NavbarItem component found for type "${type}".`);
+  }
   return <NavbarItemComponent {...(props as never)} />;
 }
diff --git a/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx b/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
index e81a01d3fc5b..8d055ce06e6f 100644
--- a/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
@@ -75,7 +75,7 @@ function TabsComponent(props: Props): JSX.Element {
       ? defaultValueProp
       : defaultValueProp ??
         children.find((child) => child.props.default)?.props.value ??
-        children[0]?.props.value;
+        children[0]!.props.value;
   if (defaultValue !== null && !values.some((a) => a.value === defaultValue)) {
     throw new Error(
       `Docusaurus error: The <Tabs> has a defaultValue "${defaultValue}" but none of its children has the corresponding value. Available values are: ${values
@@ -126,12 +126,12 @@ function TabsComponent(props: Props): JSX.Element {
     switch (event.key) {
       case 'ArrowRight': {
         const nextTab = tabRefs.indexOf(event.currentTarget) + 1;
-        focusElement = tabRefs[nextTab] || tabRefs[0]!;
+        focusElement = tabRefs[nextTab] ?? tabRefs[0]!;
         break;
       }
       case 'ArrowLeft': {
         const prevTab = tabRefs.indexOf(event.currentTarget) - 1;
-        focusElement = tabRefs[prevTab] || tabRefs[tabRefs.length - 1]!;
+        focusElement = tabRefs[prevTab] ?? tabRefs[tabRefs.length - 1]!;
         break;
       }
       default:
diff --git a/packages/docusaurus-theme-common/src/components/Details/index.tsx b/packages/docusaurus-theme-common/src/components/Details/index.tsx
index 41c34097aa86..19952166bc59 100644
--- a/packages/docusaurus-theme-common/src/components/Details/index.tsx
+++ b/packages/docusaurus-theme-common/src/components/Details/index.tsx
@@ -92,7 +92,7 @@ export function Details({
         }
       }}>
       {/* eslint-disable-next-line @docusaurus/no-untranslated-text */}
-      {summary || <summary>Details</summary>}
+      {summary ?? <summary>Details</summary>}
 
       <Collapsible
         lazy={false} // Content might matter for SEO in this case
diff --git a/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts b/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts
index 924ede9e09c3..311725f91567 100644
--- a/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts
+++ b/packages/docusaurus-theme-common/src/hooks/useTOCHighlight.ts
@@ -151,7 +151,7 @@ export function useTOCHighlight(config: TOCHighlightConfig | undefined): void {
     function updateLinkActiveClass(link: HTMLAnchorElement, active: boolean) {
       if (active) {
         if (lastActiveLinkRef.current && lastActiveLinkRef.current !== link) {
-          lastActiveLinkRef.current?.classList.remove(linkActiveClassName);
+          lastActiveLinkRef.current.classList.remove(linkActiveClassName);
         }
         link.classList.add(linkActiveClassName);
         lastActiveLinkRef.current = link;
diff --git a/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts b/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts
index a0d3163df88e..5acef72cf38a 100644
--- a/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/codeBlockUtils.ts
@@ -97,7 +97,7 @@ export function parseCodeBlockTitle(metastring?: string): string {
 }
 
 export function containsLineNumbers(metastring?: string): boolean {
-  return metastring?.includes('showLineNumbers') || false;
+  return Boolean(metastring?.includes('showLineNumbers'));
 }
 
 /**
@@ -209,7 +209,9 @@ export function parseLines(
       lineNumber += 1;
       continue;
     }
-    const directive = match.slice(1).find((item) => item !== undefined)!;
+    const directive = match
+      .slice(1)
+      .find((item: string | undefined) => item !== undefined)!;
     if (lineToClassName[directive]) {
       blocks[lineToClassName[directive]!]!.range += `${lineNumber},`;
     } else if (blockStartToClassName[directive]) {
diff --git a/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts b/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts
index 111468e5ea88..b160bf307c84 100644
--- a/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts
+++ b/packages/docusaurus-theme-common/src/utils/useThemeConfig.ts
@@ -85,10 +85,10 @@ export type FooterBase = {
 };
 
 export type MultiColumnFooter = FooterBase & {
-  links: Array<{
+  links: {
     title: string | null;
     items: FooterLinkItem[];
-  }>;
+  }[];
 };
 
 export type SimpleFooter = FooterBase & {
@@ -123,7 +123,7 @@ export type ThemeConfig = {
   prism: PrismConfig;
   footer?: Footer;
   image?: string;
-  metadata: Array<{[key: string]: string}>;
+  metadata: {[key: string]: string}[];
   tableOfContents: TableOfContents;
 };
 
diff --git a/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx b/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
index 64a6cc354517..ef5c0f0f4ff9 100644
--- a/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
+++ b/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
@@ -98,7 +98,7 @@ export default function Playground({
       {/* @ts-expect-error: type incompatibility with refs */}
       <LiveProvider
         code={children.replace(/\n$/, '')}
-        transformCode={transformCode || ((code) => `${code};`)}
+        transformCode={transformCode ?? ((code) => `${code};`)}
         theme={prismTheme}
         {...props}>
         {playgroundPosition === 'top' ? (
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 217555ad316d..bd36e353aa6a 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
@@ -75,7 +75,7 @@ type FacetFilters = Required<
 function mergeFacetFilters(f1: FacetFilters, f2: FacetFilters): FacetFilters {
   const normalize = (
     f: FacetFilters,
-  ): readonly string[] | ReadonlyArray<string | readonly string[]> =>
+  ): readonly string[] | readonly (string | readonly string[])[] =>
     typeof f === 'string' ? [f] : f;
   return [...normalize(f1), ...normalize(f2)] as FacetFilters;
 }
diff --git a/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts b/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts
index 3b7a611cbcd6..446a1ea9d090 100644
--- a/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts
+++ b/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts
@@ -22,8 +22,10 @@ describe('theme translations', () => {
       .then((files) =>
         Promise.all(
           files.map(
-            (baseMessagesFile): Promise<{[key: string]: string}> =>
-              fs.readJSON(path.join(baseMessagesDirPath, baseMessagesFile)),
+            (baseMessagesFile) =>
+              fs.readJSON(
+                path.join(baseMessagesDirPath, baseMessagesFile),
+              ) as Promise<{[key: string]: string}>,
           ),
         ),
       )
diff --git a/packages/docusaurus-theme-translations/src/index.ts b/packages/docusaurus-theme-translations/src/index.ts
index 8b9afb841d90..4c2538044409 100644
--- a/packages/docusaurus-theme-translations/src/index.ts
+++ b/packages/docusaurus-theme-translations/src/index.ts
@@ -51,7 +51,7 @@ export async function readDefaultCodeTranslationMessages({
     const filePath = path.resolve(dirPath, localeToTry, `${name}.json`);
 
     if (await fs.pathExists(filePath)) {
-      return fs.readJSON(filePath);
+      return fs.readJSON(filePath) as Promise<CodeTranslations>;
     }
   }
 
diff --git a/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts b/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts
index eb6cc8d13f07..6059d2946d08 100644
--- a/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts
@@ -37,21 +37,24 @@ describe('isNameTooLong', () => {
     };
     const oldProcessPlatform = process.platform;
     Object.defineProperty(process, 'platform', {value: 'darwin'});
-    Object.keys(asserts).forEach((file) => {
+    (Object.keys(asserts) as (keyof typeof asserts)[]).forEach((file) => {
+      const expected = asserts[file];
       expect(isNameTooLong(file)).toBe(
-        typeof asserts[file] === 'boolean' ? asserts[file] : asserts[file].apfs,
+        typeof expected === 'boolean' ? expected : expected.apfs,
       );
     });
     Object.defineProperty(process, 'platform', {value: 'win32'});
-    Object.keys(asserts).forEach((file) => {
+    (Object.keys(asserts) as (keyof typeof asserts)[]).forEach((file) => {
+      const expected = asserts[file];
       expect(isNameTooLong(file)).toBe(
-        typeof asserts[file] === 'boolean' ? asserts[file] : asserts[file].apfs,
+        typeof expected === 'boolean' ? expected : expected.apfs,
       );
     });
     Object.defineProperty(process, 'platform', {value: 'android'});
-    Object.keys(asserts).forEach((file) => {
+    (Object.keys(asserts) as (keyof typeof asserts)[]).forEach((file) => {
+      const expected = asserts[file];
       expect(isNameTooLong(file)).toBe(
-        typeof asserts[file] === 'boolean' ? asserts[file] : asserts[file].xfs,
+        typeof expected === 'boolean' ? expected : expected.xfs,
       );
     });
     Object.defineProperty(process, 'platform', {value: oldProcessPlatform});
@@ -79,21 +82,24 @@ describe('shortName', () => {
     };
     const oldProcessPlatform = process.platform;
     Object.defineProperty(process, 'platform', {value: 'darwin'});
-    Object.keys(asserts).forEach((file) => {
+    (Object.keys(asserts) as (keyof typeof asserts)[]).forEach((file) => {
+      const expected = asserts[file];
       expect(shortName(file)).toBe(
-        typeof asserts[file] === 'string' ? asserts[file] : asserts[file].apfs,
+        typeof expected === 'string' ? expected : expected.apfs,
       );
     });
     Object.defineProperty(process, 'platform', {value: 'win32'});
-    Object.keys(asserts).forEach((file) => {
+    (Object.keys(asserts) as (keyof typeof asserts)[]).forEach((file) => {
+      const expected = asserts[file];
       expect(shortName(file)).toBe(
-        typeof asserts[file] === 'string' ? asserts[file] : asserts[file].apfs,
+        typeof expected === 'string' ? expected : expected.apfs,
       );
     });
     Object.defineProperty(process, 'platform', {value: 'android'});
-    Object.keys(asserts).forEach((file) => {
+    (Object.keys(asserts) as (keyof typeof asserts)[]).forEach((file) => {
+      const expected = asserts[file];
       expect(shortName(file)).toBe(
-        typeof asserts[file] === 'string' ? asserts[file] : asserts[file].xfs,
+        typeof expected === 'string' ? expected : expected.xfs,
       );
     });
     Object.defineProperty(process, 'platform', {value: oldProcessPlatform});
diff --git a/packages/docusaurus/bin/beforeCli.mjs b/packages/docusaurus/bin/beforeCli.mjs
index fa4cecdbc77c..238939f2a0b8 100644
--- a/packages/docusaurus/bin/beforeCli.mjs
+++ b/packages/docusaurus/bin/beforeCli.mjs
@@ -16,7 +16,9 @@ import updateNotifier from 'update-notifier';
 import boxen from 'boxen';
 import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 
-const packageJson = createRequire(import.meta.url)('../package.json');
+const packageJson = /** @type {import("../package.json")} */ (
+  createRequire(import.meta.url)('../package.json')
+);
 /** @type {Record<string, any>} */
 let sitePkg;
 try {
diff --git a/packages/docusaurus/src/client/ClientLifecyclesDispatcher.tsx b/packages/docusaurus/src/client/ClientLifecyclesDispatcher.tsx
index caf75a1647bf..e9cb7f8d5f5a 100644
--- a/packages/docusaurus/src/client/ClientLifecyclesDispatcher.tsx
+++ b/packages/docusaurus/src/client/ClientLifecyclesDispatcher.tsx
@@ -15,7 +15,7 @@ export function dispatchLifecycleAction<K extends keyof ClientModule>(
   ...args: Parameters<NonNullable<ClientModule[K]>>
 ): () => void {
   const callbacks = clientModules.map((clientModule) => {
-    const lifecycleFunction = (clientModule?.default?.[lifecycleAction] ??
+    const lifecycleFunction = (clientModule.default?.[lifecycleAction] ??
       clientModule[lifecycleAction]) as
       | ((
           ...a: Parameters<NonNullable<ClientModule[K]>>
diff --git a/packages/docusaurus/src/client/__tests__/flat.test.ts b/packages/docusaurus/src/client/__tests__/flat.test.ts
index f931108938bb..54c252393dd1 100644
--- a/packages/docusaurus/src/client/__tests__/flat.test.ts
+++ b/packages/docusaurus/src/client/__tests__/flat.test.ts
@@ -41,7 +41,7 @@ describe('flat', () => {
       null: null,
       undefined,
     };
-    Object.keys(primitives).forEach((key) => {
+    (Object.keys(primitives) as (keyof typeof primitives)[]).forEach((key) => {
       const value = primitives[key];
       expect(
         flat({
diff --git a/packages/docusaurus/src/client/docusaurus.ts b/packages/docusaurus/src/client/docusaurus.ts
index 987f931ede0a..da1236cacede 100644
--- a/packages/docusaurus/src/client/docusaurus.ts
+++ b/packages/docusaurus/src/client/docusaurus.ts
@@ -70,7 +70,7 @@ const docusaurus = {
         // In some cases, webpack might decide to optimize further, leading to
         // the chunk assets being merged to another chunk. In this case, we can
         // safely filter it out and don't need to load it.
-        if (chunkAsset && !/undefined/.test(chunkAsset)) {
+        if (chunkAsset && !chunkAsset.includes('undefined')) {
           return prefetchHelper(chunkAsset);
         }
         return Promise.resolve();
diff --git a/packages/docusaurus/src/client/exports/Link.tsx b/packages/docusaurus/src/client/exports/Link.tsx
index 78a3f91a6b7b..614c608c3faf 100644
--- a/packages/docusaurus/src/client/exports/Link.tsx
+++ b/packages/docusaurus/src/client/exports/Link.tsx
@@ -47,10 +47,7 @@ function Link(
   const linksCollector = useLinksCollector();
   const innerRef = useRef<HTMLAnchorElement | null>(null);
 
-  useImperativeHandle(
-    forwardedRef,
-    () => innerRef.current as HTMLAnchorElement,
-  );
+  useImperativeHandle(forwardedRef, () => innerRef.current!);
 
   // IMPORTANT: using to or href should not change anything
   // For example, MDX links will ALWAYS give us the href props
diff --git a/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx b/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx
index b688427aa9a5..1f52a15b4070 100644
--- a/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx
+++ b/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx
@@ -26,19 +26,6 @@ describe('useGlobalData', () => {
       }).result.current,
     ).toEqual({foo: 'bar'});
   });
-
-  it('throws when global data not found', () => {
-    // Can it actually happen?
-    expect(
-      () =>
-        renderHook(() => useGlobalData(), {
-          wrapper: ({children}) => (
-            // eslint-disable-next-line react/jsx-no-constructed-context-values
-            <Context.Provider value={{}}>{children}</Context.Provider>
-          ),
-        }).result.current,
-    ).toThrowErrorMatchingInlineSnapshot(`"Docusaurus global data not found."`);
-  });
 });
 
 describe('useAllPluginInstancesData', () => {
diff --git a/packages/docusaurus/src/client/exports/isInternalUrl.ts b/packages/docusaurus/src/client/exports/isInternalUrl.ts
index f3158e6e9859..489aff74bc0d 100644
--- a/packages/docusaurus/src/client/exports/isInternalUrl.ts
+++ b/packages/docusaurus/src/client/exports/isInternalUrl.ts
@@ -6,7 +6,7 @@
  */
 
 export function hasProtocol(url: string): boolean {
-  return /^(?:\w*:|\/\/)/.test(url) === true;
+  return /^(?:\w*:|\/\/)/.test(url);
 }
 
 export default function isInternalUrl(url?: string): boolean {
diff --git a/packages/docusaurus/src/client/exports/useGlobalData.ts b/packages/docusaurus/src/client/exports/useGlobalData.ts
index 004d99e38a16..7036878568bd 100644
--- a/packages/docusaurus/src/client/exports/useGlobalData.ts
+++ b/packages/docusaurus/src/client/exports/useGlobalData.ts
@@ -11,9 +11,6 @@ import type {GlobalData, UseDataOptions} from '@docusaurus/types';
 
 export default function useGlobalData(): GlobalData {
   const {globalData} = useDocusaurusContext();
-  if (!globalData) {
-    throw new Error('Docusaurus global data not found.');
-  }
   return globalData;
 }
 
diff --git a/packages/docusaurus/src/client/flat.ts b/packages/docusaurus/src/client/flat.ts
index 8413842b8b76..3ef06a2d38e6 100644
--- a/packages/docusaurus/src/client/flat.ts
+++ b/packages/docusaurus/src/client/flat.ts
@@ -10,7 +10,7 @@ import type {ChunkNames} from '@docusaurus/types';
 type Chunk = ChunkNames[string];
 type Tree = Exclude<Chunk, string>;
 
-const isTree = (x: Chunk): x is Tree =>
+const isTree = (x: unknown): x is Tree =>
   typeof x === 'object' && !!x && Object.keys(x).length > 0;
 
 /**
diff --git a/packages/docusaurus/src/client/prefetch.ts b/packages/docusaurus/src/client/prefetch.ts
index a7a58008a753..4b84c7e884a0 100644
--- a/packages/docusaurus/src/client/prefetch.ts
+++ b/packages/docusaurus/src/client/prefetch.ts
@@ -8,8 +8,8 @@
 function supports(feature: string) {
   try {
     const fakeLink = document.createElement('link');
-    return fakeLink.relList?.supports?.(feature);
-  } catch (err) {
+    return fakeLink.relList.supports(feature);
+  } catch {
     return false;
   }
 }
diff --git a/packages/docusaurus/src/client/serverEntry.tsx b/packages/docusaurus/src/client/serverEntry.tsx
index 9918e4220adb..528a0a96e3a8 100644
--- a/packages/docusaurus/src/client/serverEntry.tsx
+++ b/packages/docusaurus/src/client/serverEntry.tsx
@@ -115,9 +115,9 @@ async function doRender(locals: Locals & {path: string}) {
   // Using readJSON seems to fail for users of some plugins, possibly because of
   // the eval sandbox having a different `Buffer` instance (native one instead
   // of polyfilled one)
-  const manifest: Manifest = await fs
+  const manifest = (await fs
     .readFile(manifestPath, 'utf-8')
-    .then(JSON.parse);
+    .then(JSON.parse)) as Manifest;
 
   // Get all required assets for this particular page based on client
   // manifest information.
diff --git a/packages/docusaurus/src/server/__tests__/__snapshots__/configValidation.test.ts.snap b/packages/docusaurus/src/server/__tests__/__snapshots__/configValidation.test.ts.snap
index b8a9733d0214..5aceb9625550 100644
--- a/packages/docusaurus/src/server/__tests__/__snapshots__/configValidation.test.ts.snap
+++ b/packages/docusaurus/src/server/__tests__/__snapshots__/configValidation.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`normalizeConfig should throw error if plugins is not a string and it's not an array #1 for the input of: [123] 1`] = `
-" => Bad Docusaurus plugin value as path [plugins,0].
+" => Bad Docusaurus plugin value plugins[0].
 Example valid plugin config:
 {
   plugins: [
@@ -17,7 +17,7 @@ Example valid plugin config:
 `;
 
 exports[`normalizeConfig should throw error if plugins is not an array of [string, object][] #1 for the input of: [[Array]] 1`] = `
-" => Bad Docusaurus plugin value as path [plugins,0].
+" => Bad Docusaurus plugin value plugins[0].
 Example valid plugin config:
 {
   plugins: [
@@ -33,7 +33,7 @@ Example valid plugin config:
 `;
 
 exports[`normalizeConfig should throw error if plugins is not an array of [string, object][] #2 for the input of: [[Array]] 1`] = `
-" => Bad Docusaurus plugin value as path [plugins,0].
+" => Bad Docusaurus plugin value plugins[0].
 Example valid plugin config:
 {
   plugins: [
@@ -49,7 +49,7 @@ Example valid plugin config:
 `;
 
 exports[`normalizeConfig should throw error if plugins is not an array of [string, object][] #3 for the input of: [[Array]] 1`] = `
-" => Bad Docusaurus plugin value as path [plugins,0].
+" => Bad Docusaurus plugin value plugins[0].
 Example valid plugin config:
 {
   plugins: [
@@ -70,7 +70,7 @@ exports[`normalizeConfig should throw error if plugins is not array for the inpu
 `;
 
 exports[`normalizeConfig should throw error if themes is not a string and it's not an array #1 for the input of: [123] 1`] = `
-" => Bad Docusaurus theme value as path [themes,0].
+" => Bad Docusaurus theme value themes[0].
 Example valid theme config:
 {
   themes: [
@@ -86,7 +86,7 @@ Example valid theme config:
 `;
 
 exports[`normalizeConfig should throw error if themes is not an array of [string, object][] #1 for the input of: [[Array]] 1`] = `
-" => Bad Docusaurus theme value as path [themes,0].
+" => Bad Docusaurus theme value themes[0].
 Example valid theme config:
 {
   themes: [
@@ -102,7 +102,7 @@ Example valid theme config:
 `;
 
 exports[`normalizeConfig should throw error if themes is not an array of [string, object][] #2 for the input of: [[Array]] 1`] = `
-" => Bad Docusaurus theme value as path [themes,0].
+" => Bad Docusaurus theme value themes[0].
 Example valid theme config:
 {
   themes: [
@@ -118,7 +118,7 @@ Example valid theme config:
 `;
 
 exports[`normalizeConfig should throw error if themes is not an array of [string, object][] #3 for the input of: [[Array]] 1`] = `
-" => Bad Docusaurus theme value as path [themes,0].
+" => Bad Docusaurus theme value themes[0].
 Example valid theme config:
 {
   themes: [
diff --git a/packages/docusaurus/src/server/configValidation.ts b/packages/docusaurus/src/server/configValidation.ts
index 2820e4b44dc3..f5ef6a3cc9a4 100644
--- a/packages/docusaurus/src/server/configValidation.ts
+++ b/packages/docusaurus/src/server/configValidation.ts
@@ -100,7 +100,9 @@ function createPluginSchema(theme: boolean) {
 
           error.message = ` => Bad Docusaurus ${
             theme ? 'theme' : 'plugin'
-          } value as path [${error.path}].
+          } value ${error.path.reduce((acc, cur) =>
+            typeof cur === 'string' ? `${acc}.${cur}` : `${acc}[${cur}]`,
+          )}.
 ${validConfigExample}
 `;
         });
@@ -247,7 +249,9 @@ export function validateConfig(config: unknown): DocusaurusConfig {
   if (error) {
     const unknownFields = error.details.reduce((formattedError, err) => {
       if (err.type === 'object.unknown') {
-        return `${formattedError}"${err.path}",`;
+        return `${formattedError}"${err.path.reduce((acc, cur) =>
+          typeof cur === 'string' ? `${acc}.${cur}` : `${acc}[${cur}]`,
+        )}",`;
       }
       return formattedError;
     }, '');
diff --git a/packages/docusaurus/src/server/htmlTags.ts b/packages/docusaurus/src/server/htmlTags.ts
index 81cce416352a..e61f94680404 100644
--- a/packages/docusaurus/src/server/htmlTags.ts
+++ b/packages/docusaurus/src/server/htmlTags.ts
@@ -83,5 +83,5 @@ export function loadHtmlTags(
           .trim(),
       ),
     ),
-  );
+  ) as Pick<Props, 'headTags' | 'preBodyTags' | 'postBodyTags'>;
 }
diff --git a/packages/docusaurus/src/server/plugins/__tests__/__snapshots__/init.test.ts.snap b/packages/docusaurus/src/server/plugins/__tests__/__snapshots__/init.test.ts.snap
index b900cdd18224..048fb326e44f 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/__snapshots__/init.test.ts.snap
+++ b/packages/docusaurus/src/server/plugins/__tests__/__snapshots__/init.test.ts.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`initPlugins throws user-friendly error message for plugins with bad values 1`] = `
-" => Bad Docusaurus plugin value as path [plugins,0].
+" => Bad Docusaurus plugin value plugins[0].
 Example valid plugin config:
 {
   plugins: [
@@ -13,7 +13,7 @@ Example valid plugin config:
   ],
 };
 
- => Bad Docusaurus plugin value as path [plugins,1].
+ => Bad Docusaurus plugin value plugins[1].
 Example valid plugin config:
 {
   plugins: [
diff --git a/packages/docusaurus/src/server/plugins/__tests__/init.test.ts b/packages/docusaurus/src/server/plugins/__tests__/init.test.ts
index adcd9147dcb6..30fe4cb603a9 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/init.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/init.test.ts
@@ -21,7 +21,7 @@ describe('initPlugins', () => {
 
   it('parses plugins correctly and loads them in correct order', async () => {
     const {context, plugins} = await loadSite();
-    expect(context.siteConfig.plugins?.length).toBe(4);
+    expect(context.siteConfig.plugins).toHaveLength(4);
     expect(plugins).toHaveLength(8);
 
     expect(plugins[0].name).toBe('preset-plugin1');
diff --git a/packages/docusaurus/src/server/translations/translationsExtractor.ts b/packages/docusaurus/src/server/translations/translationsExtractor.ts
index 83be6bcd7503..dc3b44a3aef4 100644
--- a/packages/docusaurus/src/server/translations/translationsExtractor.ts
+++ b/packages/docusaurus/src/server/translations/translationsExtractor.ts
@@ -184,7 +184,7 @@ function extractSourceCodeAstTranslations(
   sourceCodeFilePath: string,
 ): SourceCodeFileTranslations {
   function sourceWarningPart(node: Node) {
-    return `File: ${sourceCodeFilePath} at line ${node.loc?.start.line}
+    return `File: ${sourceCodeFilePath} at line ${node.loc?.start.line ?? '?'}
 Full code: ${generate(node).code}`;
   }
 
@@ -313,7 +313,9 @@ ${sourceWarningPart(path.node)}`);
         if (isJSXText || isJSXExpressionContainer) {
           message = isJSXText
             ? singleChildren.node.value.trim().replace(/\s+/g, ' ')
-            : (singleChildren.get('expression') as NodePath).evaluate().value;
+            : String(
+                (singleChildren.get('expression') as NodePath).evaluate().value,
+              );
 
           translations[id ?? message] = {
             message,
diff --git a/packages/docusaurus/src/webpack/utils.ts b/packages/docusaurus/src/webpack/utils.ts
index 8a7d0aef6120..1d045731b64f 100644
--- a/packages/docusaurus/src/webpack/utils.ts
+++ b/packages/docusaurus/src/webpack/utils.ts
@@ -198,7 +198,7 @@ export function applyConfigurePostCss(
   configurePostCss: NonNullable<Plugin['configurePostCss']>,
   config: Configuration,
 ): Configuration {
-  type LocalPostCSSLoader = unknown & {
+  type LocalPostCSSLoader = object & {
     options: {postcssOptions: PostCssOptions};
   };
 
diff --git a/packages/lqip-loader/src/index.ts b/packages/lqip-loader/src/index.ts
index 5dd78269439c..66d828fffb80 100644
--- a/packages/lqip-loader/src/index.ts
+++ b/packages/lqip-loader/src/index.ts
@@ -6,7 +6,7 @@
  */
 
 import * as lqip from './lqip';
-import type {LoaderContext} from 'webpack';
+import type {LoaderContext, LoaderModule} from 'webpack';
 
 type Options = {
   base64: boolean;
@@ -36,8 +36,9 @@ export default async function lqipLoader(
   } else {
     if (!contentIsFileExport) {
       // eslint-disable-next-line global-require, @typescript-eslint/no-var-requires
-      const fileLoader = require('file-loader') as typeof import('file-loader');
-      content = fileLoader.call(this, contentBuffer);
+      const fileLoader = require('file-loader') as LoaderModule['default'];
+      // @ts-expect-error: type is a bit unwieldy...
+      content = fileLoader!.call(this, contentBuffer) as string;
     }
     source = content.match(
       /^(?:export default|module.exports =) (?<source>.*);/,
diff --git a/packages/stylelint-copyright/src/__tests__/index.test.ts b/packages/stylelint-copyright/src/__tests__/index.test.ts
index 4d0f865e153d..aa4b5de12e27 100644
--- a/packages/stylelint-copyright/src/__tests__/index.test.ts
+++ b/packages/stylelint-copyright/src/__tests__/index.test.ts
@@ -43,68 +43,64 @@ function getOutputCss(output: stylelint.LinterResult) {
 function testStylelintRule(config: stylelint.Config, tests: TestSuite) {
   describe(`${tests.ruleName}`, () => {
     const checkTestCaseContent = (testCase: TestCase) =>
-      testCase.description || testCase.code;
-
-    if (tests.accept?.length) {
-      describe('accept cases', () => {
-        tests.accept.forEach((testCase) => {
-          it(`${checkTestCaseContent(testCase)}`, async () => {
-            const options: stylelint.LinterOptions = {
-              code: testCase.code,
-              config,
-            };
-
-            const output = await stylelint.lint(options);
-            expect(output.results[0]!.warnings).toEqual([]);
-            if (!tests.fix) {
-              return;
-            }
-            const fixedOutput = await stylelint.lint({...options, fix: true});
-            const fixedCode = getOutputCss(fixedOutput);
-            expect(fixedCode).toBe(testCase.code);
-          });
+      testCase.description ?? testCase.code;
+
+    describe('accept cases', () => {
+      tests.accept.forEach((testCase) => {
+        it(`${checkTestCaseContent(testCase)}`, async () => {
+          const options: stylelint.LinterOptions = {
+            code: testCase.code,
+            config,
+          };
+
+          const output = await stylelint.lint(options);
+          expect(output.results[0]!.warnings).toEqual([]);
+          if (!tests.fix) {
+            return;
+          }
+          const fixedOutput = await stylelint.lint({...options, fix: true});
+          const fixedCode = getOutputCss(fixedOutput);
+          expect(fixedCode).toBe(testCase.code);
         });
       });
-    }
+    });
 
-    if (tests.reject?.length) {
-      describe('reject cases', () => {
-        tests.reject.forEach((testCase) => {
-          it(`${checkTestCaseContent(testCase)}`, async () => {
-            const options = {
-              code: testCase.code,
-              config,
-            };
-
-            const output = await stylelint.lint(options);
-            const {warnings} = output.results[0]!;
-            const warning = warnings[0]!;
-            expect(warnings.length).toBeGreaterThanOrEqual(1);
-            expect(testCase).toHaveMessage();
-            if (testCase.message != null) {
-              expect(warning.text).toBe(testCase.message);
-            }
-            if (testCase.line != null) {
-              expect(warning.line).toBe(testCase.line);
-            }
-            if (testCase.column != null) {
-              expect(warning.column).toBe(testCase.column);
-            }
-            if (!tests.fix) {
-              return;
-            }
-            if (!testCase.fixed) {
-              throw new Error(
-                'If using { fix: true } in test tests, all reject cases must have { fixed: .. }',
-              );
-            }
-            const fixedOutput = await stylelint.lint({...options, fix: true});
-            const fixedCode = getOutputCss(fixedOutput);
-            expect(fixedCode).toBe(testCase.fixed);
-          });
+    describe('reject cases', () => {
+      tests.reject.forEach((testCase) => {
+        it(`${checkTestCaseContent(testCase)}`, async () => {
+          const options = {
+            code: testCase.code,
+            config,
+          };
+
+          const output = await stylelint.lint(options);
+          const {warnings} = output.results[0]!;
+          const warning = warnings[0]!;
+          expect(warnings.length).toBeGreaterThanOrEqual(1);
+          expect(testCase).toHaveMessage();
+          if (testCase.message != null) {
+            expect(warning.text).toBe(testCase.message);
+          }
+          if (testCase.line != null) {
+            expect(warning.line).toBe(testCase.line);
+          }
+          if (testCase.column != null) {
+            expect(warning.column).toBe(testCase.column);
+          }
+          if (!tests.fix) {
+            return;
+          }
+          if (!testCase.fixed) {
+            throw new Error(
+              'If using { fix: true } in test tests, all reject cases must have { fixed: .. }',
+            );
+          }
+          const fixedOutput = await stylelint.lint({...options, fix: true});
+          const fixedCode = getOutputCss(fixedOutput);
+          expect(fixedCode).toBe(testCase.fixed);
         });
       });
-    }
+    });
 
     expect.extend({
       toHaveMessage(testCase: TestCase) {
diff --git a/tsconfig.json b/tsconfig.json
index 34195b64e138..5a379450a1b0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -51,6 +51,7 @@
     "allowJs": true,
     "skipLibCheck": true // @types/webpack and webpack/types.d.ts are not the same thing
   },
+  "include": ["./**/*", "./**/.eslintrc.js"],
   "exclude": [
     "node_modules",
     "coverage/**",
diff --git a/website/src/pages/versions.tsx b/website/src/pages/versions.tsx
index 4a65419b8837..12d042e92eda 100644
--- a/website/src/pages/versions.tsx
+++ b/website/src/pages/versions.tsx
@@ -45,7 +45,7 @@ export default function Version(): JSX.Element {
   const pastVersions = versions.filter(
     (version) => version !== latestVersion && version.name !== 'current',
   );
-  const repoUrl = `https://github.com/${organizationName}/${projectName}`;
+  const repoUrl = `https://github.com/${organizationName!}/${projectName!}`;
 
   return (
     <Layout

From e2e40b8f5f5b186e9a878d56c898dfa1d1330eb9 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Wed, 25 May 2022 11:46:10 +0800
Subject: [PATCH 05/43] test: fix some type errors in test files (#7486)

---
 jest/deps.d.ts                                |  17 ++++
 .../remark/headings/__tests__/index.test.ts   |   2 +-
 .../transformLinks/__tests__/index.test.ts    |  10 +-
 .../src/__tests__/options.test.ts             |   2 +-
 .../src/__tests__/writeRedirectFiles.test.ts  |   6 +-
 .../src/options.ts                            |   2 +-
 .../__snapshots__/translations.test.ts.snap   |   6 ++
 .../src/__tests__/blogUtils.test.ts           |   4 +
 .../src/__tests__/feed.test.ts                |   3 +
 .../src/__tests__/frontMatter.test.ts         |   4 +-
 .../src/__tests__/index.test.ts               |  25 +++--
 .../src/__tests__/options.test.ts             |   8 +-
 .../src/__tests__/translations.test.ts        |   3 +
 .../src/options.ts                            |   2 +-
 .../remark/__tests__/footnoteIDFixer.test.ts  |   2 +-
 .../src/__tests__/cli.test.ts                 | Bin 11378 -> 11753 bytes
 .../src/__tests__/frontMatter.test.ts         |   4 +-
 .../src/__tests__/globalData.test.ts          |  10 +-
 .../src/__tests__/index.test.ts               |  92 ++++++++++++------
 .../src/__tests__/options.test.ts             |  27 +++--
 .../src/__tests__/props.test.ts               |  16 +--
 .../src/plugin-content-docs.d.ts              |  19 +++-
 .../src/sidebars/__tests__/utils.test.ts      |  15 +--
 .../src/versions/__tests__/index.test.ts      |   8 +-
 .../src/__tests__/createSitemap.test.ts       |   5 +-
 .../src/__tests__/options.test.ts             |   4 +-
 .../src/__tests__/translations.test.ts        |   4 +-
 .../src/__tests__/validateThemeConfig.test.ts |   2 +-
 .../src/theme-classic.d.ts                    |   6 +-
 .../src/theme/Tabs/index.tsx                  |   2 +-
 .../src/utils/__tests__/docsUtils.test.tsx    |  34 ++++---
 .../utils/__tests__/usePluralForm.test.tsx    |   8 +-
 .../src/__tests__/index.test.ts               |   1 +
 .../src/__tests__/jsUtils.test.ts             |  10 +-
 .../src/__tests__/webpackUtils.test.ts        |   2 +-
 .../src/client/__tests__/flat.test.ts         |   2 +-
 .../__tests__/normalizeLocation.test.ts       |  19 ++--
 .../exports/__tests__/Interpolate.test.tsx    |   6 +-
 .../exports/__tests__/useBaseUrl.test.tsx     |   8 +-
 .../server/plugins/__tests__/index.test.ts    |   4 +-
 .../src/server/plugins/__tests__/init.test.ts |  16 +--
 .../plugins/__tests__/pluginIds.test.ts       |   7 +-
 .../server/plugins/__tests__/presets.test.ts  |   6 +-
 .../__tests__/translations.test.ts            |  14 ++-
 .../__tests__/translationsExtractor.test.ts   |   4 +-
 .../src/webpack/__tests__/base.test.ts        |   4 +-
 .../src/webpack/__tests__/server.test.ts      |  12 ++-
 .../src/webpack/__tests__/utils.test.ts       |  19 ++--
 .../__tests__/no-untranslated-text.test.ts    |   9 +-
 .../string-literal-i18n-messages.test.ts      |   8 +-
 50 files changed, 320 insertions(+), 183 deletions(-)
 create mode 100644 jest/deps.d.ts

diff --git a/jest/deps.d.ts b/jest/deps.d.ts
new file mode 100644
index 000000000000..a0694f5b8128
--- /dev/null
+++ b/jest/deps.d.ts
@@ -0,0 +1,17 @@
+/**
+ * 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.
+ */
+
+// modules only used in tests
+
+declare module 'to-vfile';
+
+declare module 'remark-mdx';
+
+declare module '@testing-utils/git' {
+  const createTempRepo: typeof import('./utils/git').createTempRepo;
+  export {createTempRepo};
+}
diff --git a/packages/docusaurus-mdx-loader/src/remark/headings/__tests__/index.test.ts b/packages/docusaurus-mdx-loader/src/remark/headings/__tests__/index.test.ts
index 2d5ba57c2b78..47a31c836fc8 100644
--- a/packages/docusaurus-mdx-loader/src/remark/headings/__tests__/index.test.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/headings/__tests__/index.test.ts
@@ -21,7 +21,7 @@ function process(doc: string, plugins: Plugin[] = []) {
   return removePosition(processor.runSync(processor.parse(doc)), true);
 }
 
-function heading(label: string, id: string) {
+function heading(label: string | null, id: string) {
   return u(
     'heading',
     {depth: 2, data: {id, hProperties: {id}}},
diff --git a/packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/index.test.ts b/packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/index.test.ts
index e4511f827484..181ddd4f7315 100644
--- a/packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/index.test.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/transformLinks/__tests__/index.test.ts
@@ -13,15 +13,15 @@ import plugin from '..';
 import transformImage, {type PluginOptions} from '../../transformImage';
 
 const processFixture = async (name: string, options?: PluginOptions) => {
-  const filePath = path.join(__dirname, `__fixtures__/${name}.md`);
+  const siteDir = path.join(__dirname, `__fixtures__`);
   const staticDirs = [
-    path.join(__dirname, '__fixtures__/static'),
-    path.join(__dirname, '__fixtures__/static2'),
+    path.join(siteDir, 'static'),
+    path.join(siteDir, 'static2'),
   ];
-  const file = await vfile.read(filePath);
+  const file = await vfile.read(path.join(siteDir, `${name}.md`));
   const result = await remark()
     .use(mdx)
-    .use(transformImage, {...options, filePath, staticDirs})
+    .use(transformImage, {...options, siteDir, staticDirs})
     .use(plugin, {
       ...options,
       staticDirs,
diff --git a/packages/docusaurus-plugin-client-redirects/src/__tests__/options.test.ts b/packages/docusaurus-plugin-client-redirects/src/__tests__/options.test.ts
index 1d526c351b4d..6ef2c84d4985 100644
--- a/packages/docusaurus-plugin-client-redirects/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/__tests__/options.test.ts
@@ -9,7 +9,7 @@ import {normalizePluginOptions} from '@docusaurus/utils-validation';
 import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import type {Options} from '../options';
 
-function testValidate(options: Options) {
+function testValidate(options?: Options) {
   return validateOptions({validate: normalizePluginOptions, options});
 }
 
diff --git a/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts b/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts
index 2ed5d2f1a1b1..32b992c08650 100644
--- a/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/__tests__/writeRedirectFiles.test.ts
@@ -176,11 +176,11 @@ describe('writeRedirectFiles', () => {
     await writeRedirectFiles(filesMetadata);
 
     await expect(
-      fs.readFile(filesMetadata[0].fileAbsolutePath, 'utf8'),
+      fs.readFile(filesMetadata[0]!.fileAbsolutePath, 'utf8'),
     ).resolves.toBe('content 1');
 
     await expect(
-      fs.readFile(filesMetadata[1].fileAbsolutePath, 'utf8'),
+      fs.readFile(filesMetadata[1]!.fileAbsolutePath, 'utf8'),
     ).resolves.toBe('content 2');
   });
 
@@ -195,7 +195,7 @@ describe('writeRedirectFiles', () => {
     ];
 
     await fs.outputFile(
-      filesMetadata[0].fileAbsolutePath,
+      filesMetadata[0]!.fileAbsolutePath,
       'file already exists!',
     );
 
diff --git a/packages/docusaurus-plugin-client-redirects/src/options.ts b/packages/docusaurus-plugin-client-redirects/src/options.ts
index 72f3da3010bd..389e90b958aa 100644
--- a/packages/docusaurus-plugin-client-redirects/src/options.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/options.ts
@@ -66,6 +66,6 @@ const UserOptionsSchema = Joi.object<PluginOptions>({
 export function validateOptions({
   validate,
   options: userOptions,
-}: OptionValidationContext<Options, PluginOptions>): PluginOptions {
+}: OptionValidationContext<Options | undefined, PluginOptions>): PluginOptions {
   return validate(UserOptionsSchema, userOptions);
 }
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/translations.test.ts.snap b/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/translations.test.ts.snap
index beb31a882566..729181bd219d 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/translations.test.ts.snap
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/__snapshots__/translations.test.ts.snap
@@ -44,11 +44,14 @@ exports[`translateContent falls back when translation is incomplete 1`] = `
   ],
   "blogPosts": [
     {
+      "content": "",
       "id": "hello",
       "metadata": {
+        "authors": [],
         "date": 2021-07-19T00:00:00.000Z,
         "description": "/blog/2021/06/19/hello",
         "formattedDate": "June 19, 2021",
+        "frontMatter": {},
         "permalink": "/blog/2021/06/19/hello",
         "source": "/blog/2021/06/19/hello",
         "tags": [],
@@ -85,11 +88,14 @@ exports[`translateContent returns translated loaded 1`] = `
   ],
   "blogPosts": [
     {
+      "content": "",
       "id": "hello",
       "metadata": {
+        "authors": [],
         "date": 2021-07-19T00:00:00.000Z,
         "description": "/blog/2021/06/19/hello",
         "formattedDate": "June 19, 2021",
+        "frontMatter": {},
         "permalink": "/blog/2021/06/19/hello",
         "source": "/blog/2021/06/19/hello",
         "tags": [],
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/blogUtils.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/blogUtils.test.ts
index 1d9cafef920f..2adc44ca9831 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/blogUtils.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/blogUtils.test.ts
@@ -211,7 +211,11 @@ describe('linkify', () => {
           title: 'date-matter',
         },
         truncated: false,
+        frontMatter: {},
+        authors: [],
+        formattedDate: '',
       },
+      content: '',
     },
   ];
 
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
index 2e5d96872dfe..d7747d16300c 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
@@ -21,6 +21,9 @@ const DefaultI18N: I18n = {
   defaultLocale: 'en',
   localeConfigs: {
     en: {
+      label: 'English',
+      direction: 'ltr',
+      htmlLang: 'en',
       calendar: 'gregory',
     },
   },
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/frontMatter.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/frontMatter.test.ts
index 36cc680df0e0..7d769afe3f69 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/frontMatter.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/frontMatter.test.ts
@@ -56,7 +56,9 @@ function testField(params: {
           );
         } catch (err) {
           // eslint-disable-next-line jest/no-conditional-expect
-          expect(err.message).toMatch(new RegExp(escapeStringRegexp(message)));
+          expect((err as Error).message).toMatch(
+            new RegExp(escapeStringRegexp(message)),
+          );
         }
       });
     });
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
index 384b7014c7ea..0c49808e9c33 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
@@ -41,7 +41,14 @@ function getI18n(locale: string): I18n {
     currentLocale: locale,
     locales: [locale],
     defaultLocale: locale,
-    localeConfigs: {[locale]: {calendar: 'gregory'}},
+    localeConfigs: {
+      [locale]: {
+        calendar: 'gregory',
+        label: locale,
+        htmlLang: locale,
+        direction: 'ltr',
+      },
+    },
   };
 }
 
@@ -297,28 +304,28 @@ describe('blog plugin', () => {
     const siteDir = path.join(__dirname, '__fixtures__', 'website');
     const blogPostsFrench = await getBlogPosts(siteDir, {}, getI18n('fr'));
     expect(blogPostsFrench).toHaveLength(8);
-    expect(blogPostsFrench[0].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[0]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"6 mars 2021"`,
     );
-    expect(blogPostsFrench[1].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[1]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"5 mars 2021"`,
     );
-    expect(blogPostsFrench[2].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[2]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"16 août 2020"`,
     );
-    expect(blogPostsFrench[3].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[3]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"15 août 2020"`,
     );
-    expect(blogPostsFrench[4].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[4]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"27 février 2020"`,
     );
-    expect(blogPostsFrench[5].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[5]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"2 janvier 2019"`,
     );
-    expect(blogPostsFrench[6].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[6]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"1 janvier 2019"`,
     );
-    expect(blogPostsFrench[7].metadata.formattedDate).toMatchInlineSnapshot(
+    expect(blogPostsFrench[7]!.metadata.formattedDate).toMatchInlineSnapshot(
       `"14 décembre 2018"`,
     );
   });
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
index dd2e562bdabc..61f0da6c99c0 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
@@ -9,7 +9,7 @@ import {normalizePluginOptions} from '@docusaurus/utils-validation';
 import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import type {Options} from '@docusaurus/plugin-content-blog';
 
-function testValidate(options: Options) {
+function testValidate(options?: Options) {
   return validateOptions({validate: normalizePluginOptions, options});
 }
 
@@ -44,13 +44,14 @@ describe('validateOptions', () => {
   });
 
   it('accepts valid user options', () => {
-    const userOptions = {
+    const userOptions: Options = {
       ...defaultOptions,
       routeBasePath: 'myBlog',
       beforeDefaultRemarkPlugins: [],
       beforeDefaultRehypePlugins: [markdownPluginsFunctionStub],
       remarkPlugins: [[markdownPluginsFunctionStub, {option1: '42'}]],
       rehypePlugins: [
+        // @ts-expect-error: it seems to work in practice
         markdownPluginsObjectStub,
         [markdownPluginsFunctionStub, {option1: '42'}],
       ],
@@ -73,6 +74,7 @@ describe('validateOptions', () => {
     expect(() =>
       testValidate({
         feedOptions: {
+          // @ts-expect-error: test
           type: 'none',
         },
       }),
@@ -138,6 +140,7 @@ describe('validateOptions', () => {
 
   it('rejects "abcdef" sidebar count', () => {
     const userOptions = {blogSidebarCount: 'abcdef'};
+    // @ts-expect-error: test
     expect(() => testValidate(userOptions)).toThrowErrorMatchingInlineSnapshot(
       `""blogSidebarCount" must be one of [ALL, number]"`,
     );
@@ -153,6 +156,7 @@ describe('validateOptions', () => {
 
   it('rejects 42 sidebar title', () => {
     const userOptions = {blogSidebarTitle: 42};
+    // @ts-expect-error: test
     expect(() => testValidate(userOptions)).toThrowErrorMatchingInlineSnapshot(
       `""blogSidebarTitle" must be a string"`,
     );
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
index a29ae6e3acb7..5056da948215 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
@@ -33,7 +33,10 @@ const sampleBlogPosts: BlogPost[] = [
       tags: [],
       title: 'Hello',
       truncated: true,
+      authors: [],
+      frontMatter: {},
     },
+    content: '',
   },
 ];
 
diff --git a/packages/docusaurus-plugin-content-blog/src/options.ts b/packages/docusaurus-plugin-content-blog/src/options.ts
index ff06c867dc9d..0375aba578e3 100644
--- a/packages/docusaurus-plugin-content-blog/src/options.ts
+++ b/packages/docusaurus-plugin-content-blog/src/options.ts
@@ -135,7 +135,7 @@ const PluginOptionSchema = Joi.object<PluginOptions>({
 export function validateOptions({
   validate,
   options,
-}: OptionValidationContext<Options, PluginOptions>): PluginOptions {
+}: OptionValidationContext<Options | undefined, PluginOptions>): PluginOptions {
   const validatedOptions = validate(PluginOptionSchema, options);
   return validatedOptions;
 }
diff --git a/packages/docusaurus-plugin-content-blog/src/remark/__tests__/footnoteIDFixer.test.ts b/packages/docusaurus-plugin-content-blog/src/remark/__tests__/footnoteIDFixer.test.ts
index 2890766350c9..1c757047444b 100644
--- a/packages/docusaurus-plugin-content-blog/src/remark/__tests__/footnoteIDFixer.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/remark/__tests__/footnoteIDFixer.test.ts
@@ -13,7 +13,7 @@ import footnoteIDFixer from '../footnoteIDFixer';
 
 const processFixture = async (name: string) => {
   const filepath = path.join(__dirname, `__fixtures__/${name}.md`);
-  const result = await mdx(await fs.readFile(filepath), {
+  const result = await mdx(await fs.readFile(filepath, 'utf8'), {
     filepath,
     remarkPlugins: [footnoteIDFixer],
   });
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/cli.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/cli.test.ts
index 55c50ab0cddf930ca37a38e3b431cfad218d6b70..194ce3c4e46e20344c3dc2a7f279d59ada8235f0 100644
GIT binary patch
delta 650
zcmewq@iKaY4wFG<Zb5!gi9$(bL8?NvPkv&GbADb)YDGz{LRwLNu7bKlN`7)_abjsv
zX|X;?(PRy#pOX!kYXlV%ixmQLO4Bp*{0mAl^Ye-)uVJp4EYGLG50XJLX|f@k?c`ck
zjmb+`=HQT<i%s8VL$(M;EE;4dujWvie1iQLHo48KIrOk;3f`>4b%_z1H9+SDPtM?J
z#3>id`vr?l!INk4?Zzs;f`1!U@r?rSu!!4EULee|`H5gXHdotjULYLE$f!8^qlh|?
zyd`rGNY0j(;!?CyD9y{x%P-HHoTwT)Sy*oN<iB#xll8^-p<A)}t@tq(f+lPhmivh5
zfVbjylb2}tPu`#?IN4uOb+U(6If%X4U$GVFsLfZD;+P1U4079MU3E*Wrf*)NagG@P
DWnSY;

delta 300
zcmaDE{V8ID4%6fWrmy@~3IRE#>6v-{1tppJdBu}MnQJCL0^;}VVvMzu4LM~e^YbZ8
zzQl3_&VIx?7e&@=GbcMMBT(9Yatz0@&4!%bAPz{M+2(s(ml#nLn@_gpZ9s@@=I7Ib
ztDZcYe>Y6$<Q)Rr;Oq;6@1Sgj$#+FKHVX;Y!!#*uzAF;QI9Xpzee!;_gOeN8r8dt|
zS7n@Bs~|qPKw{r!TghWA$g-2?sQ=u|q!7k9`L1T~<Th!M%^XVlOq(rK;+T+?0Sz%?
K+I&}&hXnw-++)N5

diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
index 6612927c2d0c..81eedbf13b9a 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
@@ -56,7 +56,9 @@ function testField(params: {
         );
       } catch (err) {
         // eslint-disable-next-line jest/no-conditional-expect
-        expect(err.message).toMatch(new RegExp(escapeStringRegexp(message)));
+        expect((err as Error).message).toMatch(
+          new RegExp(escapeStringRegexp(message)),
+        );
       }
     });
   });
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/globalData.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/globalData.test.ts
index 8c05e812635f..35663e48b7aa 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/globalData.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/globalData.test.ts
@@ -9,6 +9,7 @@ import {toGlobalDataVersion} from '../globalData';
 import {createSidebarsUtils} from '../sidebars/utils';
 import {getCategoryGeneratedIndexMetadataList} from '../categoryGeneratedIndex';
 import type {Sidebars} from '../sidebars/types';
+import type {DocMetadata} from '@docusaurus/plugin-content-docs';
 
 describe('toGlobalDataVersion', () => {
   it('generates the right docs, sidebars, and metadata', () => {
@@ -25,7 +26,7 @@ describe('toGlobalDataVersion', () => {
         sidebar: 'tutorial',
         frontMatter: {},
       },
-    ];
+    ] as DocMetadata[];
     const sidebars: Sidebars = {
       tutorial: [
         {
@@ -46,6 +47,8 @@ describe('toGlobalDataVersion', () => {
               id: 'doc',
             },
           ],
+          collapsed: false,
+          collapsible: true,
         },
       ],
       links: [
@@ -75,6 +78,8 @@ describe('toGlobalDataVersion', () => {
               id: 'doc',
             },
           ],
+          collapsed: false,
+          collapsible: true,
         },
       ],
     };
@@ -85,7 +90,6 @@ describe('toGlobalDataVersion', () => {
         label: 'Label',
         isLast: true,
         path: '/current',
-        mainDocId: 'main',
         docs,
         drafts: [
           {
@@ -93,7 +97,7 @@ describe('toGlobalDataVersion', () => {
             permalink: '/current/draft',
             sidebar: undefined,
           },
-        ],
+        ] as DocMetadata[],
         sidebars,
         categoryGeneratedIndices: getCategoryGeneratedIndexMetadataList({
           docs,
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 fd25cc85eef9..2f83e3f0b576 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -26,13 +26,28 @@ import * as cliDocs from '../cli';
 import {validateOptions} from '../options';
 
 import type {RouteConfig} from '@docusaurus/types';
-import type {LoadedVersion} from '@docusaurus/plugin-content-docs';
-import type {SidebarItem, SidebarItemsGeneratorOption} from '../sidebars/types';
-
-function findDocById(version: LoadedVersion, unversionedId: string) {
+import type {
+  LoadedVersion,
+  PropSidebarItemLink,
+} from '@docusaurus/plugin-content-docs';
+import type {
+  SidebarItemsGeneratorOption,
+  NormalizedSidebar,
+} from '../sidebars/types';
+
+function findDocById(
+  version: LoadedVersion | undefined,
+  unversionedId: string,
+) {
+  if (!version) {
+    throw new Error('Version not found');
+  }
   return version.docs.find((item) => item.unversionedId === unversionedId);
 }
-function getDocById(version: LoadedVersion, unversionedId: string) {
+function getDocById(version: LoadedVersion | undefined, unversionedId: string) {
+  if (!version) {
+    throw new Error('Version not found');
+  }
   const doc = findDocById(version, unversionedId);
   if (!doc) {
     throw new Error(
@@ -83,7 +98,10 @@ Entries created:
     getGlobalData: () => globalDataContainer,
     getRouteConfigs: () => routeConfigs,
 
-    checkVersionMetadataPropCreated: (version: LoadedVersion) => {
+    checkVersionMetadataPropCreated: (version: LoadedVersion | undefined) => {
+      if (!version) {
+        throw new Error('Version not found');
+      }
       const versionMetadataProp = getCreatedDataByPrefix(
         `version-${_.kebabCase(version.versionName)}-metadata-prop`,
       );
@@ -164,7 +182,7 @@ describe('sidebar', () => {
     const result = await plugin.loadContent!();
 
     expect(result.loadedVersions).toHaveLength(1);
-    expect(result.loadedVersions[0].sidebars).toMatchSnapshot();
+    expect(result.loadedVersions[0]!.sidebars).toMatchSnapshot();
   });
 
   it('site with disabled sidebar', async () => {
@@ -182,7 +200,7 @@ describe('sidebar', () => {
     const result = await plugin.loadContent!();
 
     expect(result.loadedVersions).toHaveLength(1);
-    expect(result.loadedVersions[0].sidebars).toEqual(DisabledSidebars);
+    expect(result.loadedVersions[0]!.sidebars).toEqual(DisabledSidebars);
   });
 });
 
@@ -309,7 +327,7 @@ describe('simple website', () => {
 
     expect(getDocById(currentVersion, 'foo/bar')).toMatchSnapshot();
 
-    expect(currentVersion.sidebars).toMatchSnapshot();
+    expect(currentVersion!.sidebars).toMatchSnapshot();
 
     const {actions, utils} = createFakeActions(pluginContentDir);
 
@@ -427,10 +445,12 @@ describe('versioned website', () => {
     expect(getDocById(version101, 'hello')).toMatchSnapshot();
     expect(getDocById(version100, 'foo/baz')).toMatchSnapshot();
 
-    expect(currentVersion.sidebars).toMatchSnapshot('current version sidebars');
-    expect(version101.sidebars).toMatchSnapshot('101 version sidebars');
-    expect(version100.sidebars).toMatchSnapshot('100 version sidebars');
-    expect(versionWithSlugs.sidebars).toMatchSnapshot(
+    expect(currentVersion!.sidebars).toMatchSnapshot(
+      'current version sidebars',
+    );
+    expect(version101!.sidebars).toMatchSnapshot('101 version sidebars');
+    expect(version100!.sidebars).toMatchSnapshot('100 version sidebars');
+    expect(versionWithSlugs!.sidebars).toMatchSnapshot(
       'withSlugs version sidebars',
     );
 
@@ -534,8 +554,10 @@ describe('versioned website (community)', () => {
     expect(getDocById(currentVersion, 'team')).toMatchSnapshot();
     expect(getDocById(version100, 'team')).toMatchSnapshot();
 
-    expect(currentVersion.sidebars).toMatchSnapshot('current version sidebars');
-    expect(version100.sidebars).toMatchSnapshot('100 version sidebars');
+    expect(currentVersion!.sidebars).toMatchSnapshot(
+      'current version sidebars',
+    );
+    expect(version100!.sidebars).toMatchSnapshot('100 version sidebars');
 
     const {actions, utils} = createFakeActions(pluginContentDir);
     await plugin.contentLoaded!({
@@ -544,8 +566,8 @@ describe('versioned website (community)', () => {
       allContent: {},
     });
 
-    utils.checkVersionMetadataPropCreated(currentVersion);
-    utils.checkVersionMetadataPropCreated(version100);
+    utils.checkVersionMetadataPropCreated(currentVersion!);
+    utils.checkVersionMetadataPropCreated(version100!);
 
     utils.expectSnapshot();
   });
@@ -574,18 +596,22 @@ describe('site with doc label', () => {
 
   it('label in sidebar.json is used', async () => {
     const {content} = await loadSite();
-    const loadedVersion = content.loadedVersions[0];
+    const loadedVersion = content.loadedVersions[0]!;
     const sidebarProps = toSidebarsProp(loadedVersion);
 
-    expect(sidebarProps.docs[0].label).toBe('Hello One');
+    expect((sidebarProps.docs![0] as PropSidebarItemLink).label).toBe(
+      'Hello One',
+    );
   });
 
   it('sidebar_label in doc has higher precedence over label in sidebar.json', async () => {
     const {content} = await loadSite();
-    const loadedVersion = content.loadedVersions[0];
+    const loadedVersion = content.loadedVersions[0]!;
     const sidebarProps = toSidebarsProp(loadedVersion);
 
-    expect(sidebarProps.docs[1].label).toBe('Hello 2 From Doc');
+    expect((sidebarProps.docs![1] as PropSidebarItemLink).label).toBe(
+      'Hello 2 From Doc',
+    );
   });
 });
 
@@ -614,14 +640,14 @@ describe('site with full autogenerated sidebar', () => {
 
   it('sidebar is fully autogenerated', async () => {
     const {content} = await loadSite();
-    const version = content.loadedVersions[0];
+    const version = content.loadedVersions[0]!;
 
     expect(version.sidebars).toMatchSnapshot();
   });
 
   it('docs in fully generated sidebar have correct metadata', async () => {
     const {content} = await loadSite();
-    const version = content.loadedVersions[0];
+    const version = content.loadedVersions[0]!;
 
     expect(getDocById(version, 'getting-started')).toMatchSnapshot();
     expect(getDocById(version, 'installation')).toMatchSnapshot();
@@ -675,14 +701,14 @@ describe('site with partial autogenerated sidebars', () => {
 
   it('sidebar is partially autogenerated', async () => {
     const {content} = await loadSite();
-    const version = content.loadedVersions[0];
+    const version = content.loadedVersions[0]!;
 
     expect(version.sidebars).toMatchSnapshot();
   });
 
   it('docs in partially generated sidebar have correct metadata', async () => {
     const {content} = await loadSite();
-    const version = content.loadedVersions[0];
+    const version = content.loadedVersions[0]!;
 
     // Only looking at the docs of the autogen sidebar, others metadata should
     // not be affected
@@ -731,7 +757,7 @@ describe('site with partial autogenerated sidebars 2 (fix #4638)', () => {
 
   it('sidebar is partially autogenerated', async () => {
     const {content} = await loadSite();
-    const version = content.loadedVersions[0];
+    const version = content.loadedVersions[0]!;
 
     expect(version.sidebars).toMatchSnapshot();
   });
@@ -763,8 +789,10 @@ describe('site with custom sidebar items generator', () => {
     const customSidebarItemsGeneratorMock = jest.fn(async () => []);
     const {siteDir} = await loadSite(customSidebarItemsGeneratorMock);
 
-    const generatorArg: Parameters<SidebarItemsGeneratorOption>[0] =
-      customSidebarItemsGeneratorMock.mock.calls[0][0];
+    const generatorArg = (
+      customSidebarItemsGeneratorMock.mock
+        .calls[0] as unknown as Parameters<SidebarItemsGeneratorOption>
+    )[0];
 
     // Make test pass even if docs are in different order and paths are
     // absolutes
@@ -797,12 +825,12 @@ describe('site with custom sidebar items generator', () => {
     const {content} = await loadSite(customSidebarItemsGenerator);
     const version = content.loadedVersions[0];
 
-    expect(version.sidebars).toMatchSnapshot();
+    expect(version!.sidebars).toMatchSnapshot();
   });
 
   it('sidebarItemsGenerator can wrap/enhance/sort/reverse the default sidebar generator', async () => {
-    function reverseSidebarItems(items: SidebarItem[]): SidebarItem[] {
-      const result: SidebarItem[] = items.map((item) => {
+    function reverseSidebarItems(items: NormalizedSidebar): NormalizedSidebar {
+      const result: NormalizedSidebar = items.map((item) => {
         if (item.type === 'category') {
           return {...item, items: reverseSidebarItems(item.items)};
         }
@@ -821,7 +849,7 @@ describe('site with custom sidebar items generator', () => {
     };
 
     const {content} = await loadSite(reversedSidebarItemsGenerator);
-    const version = content.loadedVersions[0];
+    const version = content.loadedVersions[0]!;
 
     expect(version.sidebars).toMatchSnapshot();
   });
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
index a3ddd11f843d..ea4ebf043114 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
@@ -36,7 +36,7 @@ describe('normalizeDocsPluginOptions', () => {
   });
 
   it('accepts correctly defined user options', () => {
-    const userOptions = {
+    const userOptions: Options = {
       path: 'my-docs', // Path to data on filesystem, relative to site dir.
       routeBasePath: 'my-docs', // URL Route.
       tagsBasePath: 'tags', // URL Tags Route.
@@ -51,6 +51,7 @@ describe('normalizeDocsPluginOptions', () => {
       docTagsListComponent: '@theme/DocTagsListPage',
       docCategoryGeneratedIndexComponent:
         '@theme/DocCategoryGeneratedIndexPage',
+      // @ts-expect-error: it seems to work in practice?
       remarkPlugins: [markdownPluginsObjectStub],
       rehypePlugins: [markdownPluginsFunctionStub],
       beforeDefaultRehypePlugins: [],
@@ -79,16 +80,17 @@ describe('normalizeDocsPluginOptions', () => {
     expect(testValidate(userOptions)).toEqual({
       ...defaultOptions,
       ...userOptions,
-      remarkPlugins: [...userOptions.remarkPlugins, expect.any(Array)],
+      remarkPlugins: [...userOptions.remarkPlugins!, expect.any(Array)],
     });
   });
 
   it('accepts correctly defined remark and rehype plugin options', () => {
-    const userOptions = {
+    const userOptions: Options = {
       beforeDefaultRemarkPlugins: [],
       beforeDefaultRehypePlugins: [markdownPluginsFunctionStub],
       remarkPlugins: [[markdownPluginsFunctionStub, {option1: '42'}]],
       rehypePlugins: [
+        // @ts-expect-error: it seems to work in practice
         markdownPluginsObjectStub,
         [markdownPluginsFunctionStub, {option1: '42'}],
       ],
@@ -96,12 +98,12 @@ describe('normalizeDocsPluginOptions', () => {
     expect(testValidate(userOptions)).toEqual({
       ...defaultOptions,
       ...userOptions,
-      remarkPlugins: [...userOptions.remarkPlugins, expect.any(Array)],
+      remarkPlugins: [...userOptions.remarkPlugins!, expect.any(Array)],
     });
   });
 
   it('accepts admonitions false', () => {
-    const admonitionsFalse = {
+    const admonitionsFalse: Options = {
       admonitions: false,
     };
     expect(testValidate(admonitionsFalse)).toEqual({
@@ -111,7 +113,7 @@ describe('normalizeDocsPluginOptions', () => {
   });
 
   it('rejects admonitions true', () => {
-    const admonitionsTrue = {
+    const admonitionsTrue: Options = {
       admonitions: true,
     };
     expect(() =>
@@ -124,7 +126,10 @@ describe('normalizeDocsPluginOptions', () => {
   it('accepts numberPrefixParser function', () => {
     function customNumberPrefixParser() {}
     expect(
-      testValidate({numberPrefixParser: customNumberPrefixParser}),
+      testValidate({
+        numberPrefixParser:
+          customNumberPrefixParser as unknown as Options['numberPrefixParser'],
+      }),
     ).toEqual({
       ...defaultOptions,
       numberPrefixParser: customNumberPrefixParser,
@@ -148,6 +153,7 @@ describe('normalizeDocsPluginOptions', () => {
   it('rejects invalid remark plugin options', () => {
     expect(() =>
       testValidate({
+        // @ts-expect-error: test
         remarkPlugins: [[{option1: '42'}, markdownPluginsFunctionStub]],
       }),
     ).toThrowErrorMatchingInlineSnapshot(`
@@ -161,6 +167,7 @@ describe('normalizeDocsPluginOptions', () => {
     expect(() =>
       testValidate({
         rehypePlugins: [
+          // @ts-expect-error: test
           [
             markdownPluginsFunctionStub,
             {option1: '42'},
@@ -176,6 +183,7 @@ describe('normalizeDocsPluginOptions', () => {
   });
 
   it('rejects bad path inputs', () => {
+    // @ts-expect-error: test
     expect(() => testValidate({path: 2})).toThrowErrorMatchingInlineSnapshot(
       `""path" must be a string"`,
     );
@@ -183,12 +191,14 @@ describe('normalizeDocsPluginOptions', () => {
 
   it('rejects bad include inputs', () => {
     expect(() =>
+      // @ts-expect-error: test
       testValidate({include: '**/*.{md,mdx}'}),
     ).toThrowErrorMatchingInlineSnapshot(`""include" must be an array"`);
   });
 
   it('rejects bad showLastUpdateTime inputs', () => {
     expect(() =>
+      // @ts-expect-error: test
       testValidate({showLastUpdateTime: 'true'}),
     ).toThrowErrorMatchingInlineSnapshot(
       `""showLastUpdateTime" must be a boolean"`,
@@ -197,12 +207,14 @@ describe('normalizeDocsPluginOptions', () => {
 
   it('rejects bad remarkPlugins input', () => {
     expect(() =>
+      // @ts-expect-error: test
       testValidate({remarkPlugins: 'remark-math'}),
     ).toThrowErrorMatchingInlineSnapshot(`""remarkPlugins" must be an array"`);
   });
 
   it('rejects bad lastVersion', () => {
     expect(() =>
+      // @ts-expect-error: test
       testValidate({lastVersion: false}),
     ).toThrowErrorMatchingInlineSnapshot(`""lastVersion" must be a string"`);
   });
@@ -212,6 +224,7 @@ describe('normalizeDocsPluginOptions', () => {
       testValidate({
         versions: {
           current: {
+            // @ts-expect-error: test
             hey: 3,
           },
 
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/props.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/props.test.ts
index 9db11b7cdddb..7103e3908d59 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/props.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/props.test.ts
@@ -21,30 +21,30 @@ describe('toTagDocListProp', () => {
       docIds: ['id1', 'id3'],
     };
 
-    const doc1: Doc = {
+    const doc1 = {
       id: 'id1',
       title: 'ZZZ 1',
       description: 'Description 1',
       permalink: '/doc1',
-    };
-    const doc2: Doc = {
+    } as Doc;
+    const doc2 = {
       id: 'id2',
       title: 'XXX 2',
       description: 'Description 2',
       permalink: '/doc2',
-    };
-    const doc3: Doc = {
+    } as Doc;
+    const doc3 = {
       id: 'id3',
       title: 'AAA 3',
       description: 'Description 3',
       permalink: '/doc3',
-    };
-    const doc4: Doc = {
+    } as Doc;
+    const doc4 = {
       id: 'id4',
       title: 'UUU 4',
       description: 'Description 4',
       permalink: '/doc4',
-    };
+    } as Doc;
 
     const result = toTagDocListProp({
       allTagsPath,
diff --git a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
index 1d7784c63fc7..1d7be06b74dc 100644
--- a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
+++ b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
@@ -17,7 +17,7 @@ declare module '@docusaurus/plugin-content-docs' {
     Tag,
   } from '@docusaurus/utils';
   import type {Plugin, LoadContext} from '@docusaurus/types';
-  import type {Required} from 'utility-types';
+  import type {Overwrite, Required} from 'utility-types';
 
   export type Assets = {
     image?: string;
@@ -206,7 +206,22 @@ declare module '@docusaurus/plugin-content-docs' {
        */
       tagsBasePath: string;
     };
-  export type Options = Partial<PluginOptions>;
+  export type Options = Partial<
+    Overwrite<
+      PluginOptions,
+      {
+        /**
+         * 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.
+         *
+         * @param filename One segment of the path, without any slashes.
+         * @see https://docusaurus.io/docs/sidebar#using-number-prefixes
+         */
+        numberPrefixParser: PluginOptions['numberPrefixParser'] | boolean;
+      }
+    >
+  >;
   export type SidebarsConfig = import('./sidebars/types').SidebarsConfig;
 
   export type VersionMetadata = ContentPaths & {
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts
index 4085c9931dc7..60c30b96a889 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/utils.test.ts
@@ -100,10 +100,13 @@ describe('createSidebarsUtils', () => {
   const sidebar4: Sidebar = [
     {
       type: 'category',
+      collapsed: false,
+      collapsible: true,
+      label: 'Related',
       items: [
-        {type: 'link', href: 'https://facebook.com'},
-        {type: 'link', href: 'https://reactjs.org'},
-        {type: 'link', href: 'https://docusaurus.io'},
+        {type: 'link', href: 'https://facebook.com', label: 'Facebook'},
+        {type: 'link', href: 'https://reactjs.org', label: 'React'},
+        {type: 'link', href: 'https://docusaurus.io', label: 'Docusaurus'},
       ],
     },
     {
@@ -696,10 +699,10 @@ describe('toNavigationLink', () => {
 
   it('with doc items', () => {
     expect(toNavigationLink({type: 'doc', id: 'doc1'}, docsById)).toEqual(
-      toDocNavigationLink(docsById.doc1),
+      toDocNavigationLink(docsById.doc1!),
     );
     expect(toNavigationLink({type: 'doc', id: 'doc2'}, docsById)).toEqual(
-      toDocNavigationLink(docsById.doc2),
+      toDocNavigationLink(docsById.doc2!),
     );
     expect(() =>
       toNavigationLink({type: 'doc', id: 'doc3'}, docsById),
@@ -724,7 +727,7 @@ describe('toNavigationLink', () => {
         },
         docsById,
       ),
-    ).toEqual(toDocNavigationLink(docsById.doc1));
+    ).toEqual(toDocNavigationLink(docsById.doc1!));
     expect(() =>
       toNavigationLink(
         {
diff --git a/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts b/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts
index 773643ba8441..15bb3d06d720 100644
--- a/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/versions/__tests__/index.test.ts
@@ -10,7 +10,7 @@ import path from 'path';
 import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import {readVersionsMetadata} from '../index';
 import {DEFAULT_OPTIONS} from '../../options';
-import type {I18n} from '@docusaurus/types';
+import type {I18n, LoadContext} from '@docusaurus/types';
 import type {
   PluginOptions,
   VersionMetadata,
@@ -37,7 +37,7 @@ describe('readVersionsMetadata', () => {
         siteDir: simpleSiteDir,
         baseUrl: '/',
         i18n: DefaultI18N,
-      };
+      } as LoadContext;
 
       const vCurrent: VersionMetadata = {
         contentPath: path.join(simpleSiteDir, 'docs'),
@@ -198,7 +198,7 @@ describe('readVersionsMetadata', () => {
         siteDir: versionedSiteDir,
         baseUrl: '/',
         i18n: DefaultI18N,
-      };
+      } as LoadContext;
 
       const vCurrent: VersionMetadata = {
         contentPath: path.join(versionedSiteDir, 'docs'),
@@ -636,7 +636,7 @@ describe('readVersionsMetadata', () => {
         siteDir: versionedSiteDir,
         baseUrl: '/',
         i18n: DefaultI18N,
-      };
+      } as LoadContext;
 
       const vCurrent: VersionMetadata = {
         contentPath: path.join(versionedSiteDir, 'community'),
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
index 26fd096caf41..bc34ee51d87f 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
@@ -8,6 +8,7 @@
 import React from 'react';
 import {EnumChangefreq} from 'sitemap';
 import createSitemap from '../createSitemap';
+import type {PluginOptions} from '../options';
 import type {DocusaurusConfig} from '@docusaurus/types';
 
 describe('createSitemap', () => {
@@ -31,7 +32,8 @@ describe('createSitemap', () => {
 
   it('empty site', () =>
     expect(async () => {
-      await createSitemap({} as DocusaurusConfig, [], {}, {});
+      // @ts-expect-error: test
+      await createSitemap({}, [], {}, {} as PluginOptions);
     }).rejects.toThrow(
       'URL in docusaurus.config.js cannot be empty/undefined.',
     ));
@@ -148,6 +150,7 @@ describe('createSitemap', () => {
       {
         '/noindex': {
           meta: {
+            // @ts-expect-error: bad lib def
             toComponent: () => [
               React.createElement('meta', {name: 'robots', content: 'noindex'}),
             ],
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts b/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
index 8d57746125b9..e48bc9302e49 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
@@ -23,7 +23,7 @@ describe('validateOptions', () => {
   });
 
   it('accepts correctly defined user options', () => {
-    const userOptions = {
+    const userOptions: Options = {
       changefreq: 'yearly',
       priority: 0.9,
       ignorePatterns: ['/search/**'],
@@ -52,9 +52,11 @@ describe('validateOptions', () => {
 
   it('rejects bad ignorePatterns inputs', () => {
     expect(() =>
+      // @ts-expect-error: test
       testValidate({ignorePatterns: '/search'}),
     ).toThrowErrorMatchingInlineSnapshot(`""ignorePatterns" must be an array"`);
     expect(() =>
+      // @ts-expect-error: test
       testValidate({ignorePatterns: [/^\/search/]}),
     ).toThrowErrorMatchingInlineSnapshot(
       `""ignorePatterns[0]" must be a string"`,
diff --git a/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts b/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts
index 48a2c70f3ff7..ba4d3464ea35 100644
--- a/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts
@@ -9,7 +9,7 @@ import {updateTranslationFileMessages} from '@docusaurus/utils';
 import {getTranslationFiles, translateThemeConfig} from '../translations';
 import type {ThemeConfig} from '@docusaurus/theme-common';
 
-const ThemeConfigSample: ThemeConfig = {
+const ThemeConfigSample = {
   colorMode: {},
   announcementBar: {},
   prism: {},
@@ -47,7 +47,7 @@ const ThemeConfigSample: ThemeConfig = {
       },
     ],
   },
-};
+} as unknown as ThemeConfig;
 
 const ThemeConfigSampleSimpleFooter: ThemeConfig = {
   ...ThemeConfigSample,
diff --git a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
index e7c9d7dcb1b0..dd4eaae6df49 100644
--- a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
+++ b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
@@ -674,7 +674,7 @@ describe('themeConfig', () => {
     });
 
     it('max config', () => {
-      const colorMode = {
+      const colorMode: ThemeConfig['colorMode'] = {
         defaultMode: 'dark',
         disableSwitch: false,
         respectPrefersColorScheme: true,
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index bc9b9c9bbaf3..76861545731f 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -1032,10 +1032,10 @@ declare module '@theme/Tabs' {
     readonly lazy?: boolean;
     readonly block?: boolean;
     readonly children: readonly ReactElement<TabItemProps>[];
-    readonly defaultValue?: string | null;
+    readonly defaultValue?: string | number | null;
     readonly values?: readonly {
-      value: string;
-      label?: string;
+      value: string | number;
+      label?: string | number;
       attributes?: {[key: string]: unknown};
     }[];
     readonly groupId?: string;
diff --git a/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx b/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
index 8d055ce06e6f..098879881f9e 100644
--- a/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
@@ -115,7 +115,7 @@ function TabsComponent(props: Props): JSX.Element {
       setSelectedValue(newTabValue);
 
       if (groupId != null) {
-        setTabGroupChoices(groupId, newTabValue);
+        setTabGroupChoices(groupId, String(newTabValue));
       }
     }
   };
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/docsUtils.test.tsx b/packages/docusaurus-theme-common/src/utils/__tests__/docsUtils.test.tsx
index b8ac8fb9eedd..8f4c48011299 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/docsUtils.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/docsUtils.test.tsx
@@ -26,6 +26,7 @@ import type {
   PropSidebarItemLink,
   PropVersionMetadata,
 } from '@docusaurus/plugin-content-docs';
+import type {DocusaurusContext} from '@docusaurus/types';
 
 // Make tests more readable with some useful category item defaults
 function testCategory(
@@ -294,19 +295,22 @@ describe('isActiveSidebarItem', () => {
 
 describe('useSidebarBreadcrumbs', () => {
   const createUseSidebarBreadcrumbsMock =
-    (sidebar: PropSidebar, breadcrumbsOption?: boolean) => (location: string) =>
+    (sidebar: PropSidebar | undefined, breadcrumbsOption?: boolean) =>
+    (location: string) =>
       renderHook(() => useSidebarBreadcrumbs(), {
         wrapper: ({children}) => (
           <StaticRouter location={location}>
             <Context.Provider
-              // eslint-disable-next-line react/jsx-no-constructed-context-values
-              value={{
-                globalData: {
-                  'docusaurus-plugin-content-docs': {
-                    default: {path: '/', breadcrumbs: breadcrumbsOption},
+              value={
+                // eslint-disable-next-line react/jsx-no-constructed-context-values
+                {
+                  globalData: {
+                    'docusaurus-plugin-content-docs': {
+                      default: {path: '/', breadcrumbs: breadcrumbsOption},
+                    },
                   },
-                },
-              }}>
+                } as unknown as DocusaurusContext
+              }>
               <DocsSidebarProvider name="sidebarName" items={sidebar}>
                 {children}
               </DocsSidebarProvider>
@@ -421,7 +425,9 @@ describe('useSidebarBreadcrumbs', () => {
   });
 
   it('returns null when there is no sidebar', () => {
-    expect(createUseSidebarBreadcrumbsMock(null, false)('/foo')).toBeNull();
+    expect(
+      createUseSidebarBreadcrumbsMock(undefined, false)('/foo'),
+    ).toBeNull();
   });
 });
 
@@ -436,9 +442,12 @@ describe('useCurrentSidebarCategory', () => {
         ),
       }).result.current;
   it('works', () => {
-    const category = {
+    const category: PropSidebarItemCategory = {
       type: 'category',
+      label: 'Category',
       href: '/cat',
+      collapsible: true,
+      collapsed: false,
       items: [
         {type: 'link', href: '/cat/foo', label: 'Foo'},
         {type: 'link', href: '/cat/bar', label: 'Bar'},
@@ -453,8 +462,11 @@ describe('useCurrentSidebarCategory', () => {
   });
 
   it('throws for non-category index page', () => {
-    const category = {
+    const category: PropSidebarItemCategory = {
       type: 'category',
+      label: 'Category',
+      collapsible: true,
+      collapsed: false,
       items: [
         {type: 'link', href: '/cat/foo', label: 'Foo'},
         {type: 'link', href: '/cat/bar', label: 'Bar'},
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx b/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
index f7618dbb258c..f789734119f7 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
@@ -24,7 +24,7 @@ describe('usePluralForm', () => {
       i18n: {
         currentLocale: 'en',
       },
-    });
+    } as DocusaurusContext);
     expect(mockUsePluralForm().selectMessage(1, 'one|many')).toBe('one');
     expect(mockUsePluralForm().selectMessage(10, 'one|many')).toBe('many');
   });
@@ -34,7 +34,7 @@ describe('usePluralForm', () => {
       i18n: {
         currentLocale: 'zh-Hans',
       },
-    });
+    } as DocusaurusContext);
     const consoleMock = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
@@ -50,7 +50,7 @@ describe('usePluralForm', () => {
       i18n: {
         currentLocale: 'en',
       },
-    });
+    } as DocusaurusContext);
     expect(mockUsePluralForm().selectMessage(10, 'many')).toBe('many');
   });
 
@@ -59,7 +59,7 @@ describe('usePluralForm', () => {
       i18n: {
         currentLocale: 'zh-Hans',
       },
-    });
+    } as DocusaurusContext);
     const consoleMock = jest
       .spyOn(console, 'error')
       .mockImplementation(() => {});
diff --git a/packages/docusaurus-theme-translations/src/__tests__/index.test.ts b/packages/docusaurus-theme-translations/src/__tests__/index.test.ts
index af47cd2f1754..571c35474ce6 100644
--- a/packages/docusaurus-theme-translations/src/__tests__/index.test.ts
+++ b/packages/docusaurus-theme-translations/src/__tests__/index.test.ts
@@ -78,6 +78,7 @@ describe('readDefaultCodeTranslationMessages', () => {
   it('for empty locale', async () => {
     await expect(
       readDefaultCodeTranslationMessages({
+        name: 'default',
         locale: '',
         dirPath,
       }),
diff --git a/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts b/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts
index ca7218ab02ad..5831ad69626b 100644
--- a/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts
@@ -58,7 +58,7 @@ describe('mapAsyncSequential', () => {
     const timeBefore = Date.now();
     await expect(
       mapAsyncSequential(items, async (item) => {
-        const itemTimeout = itemToTimeout[item];
+        const itemTimeout = itemToTimeout[item]!;
         itemMapStartsAt[item] = Date.now();
         await sleep(itemTimeout);
         itemMapEndsAt[item] = Date.now();
@@ -72,12 +72,10 @@ describe('mapAsyncSequential', () => {
     const totalTimeouts = _.sum(Object.values(itemToTimeout));
     expect(timeTotal).toBeGreaterThanOrEqual(totalTimeouts - 100);
 
-    expect(itemMapStartsAt['1']).toBeGreaterThanOrEqual(0);
-    expect(itemMapStartsAt['2']).toBeGreaterThanOrEqual(
-      itemMapEndsAt['1'] - 100,
-    );
+    expect(itemMapStartsAt[1]).toBeGreaterThanOrEqual(0);
+    expect(itemMapStartsAt[2]).toBeGreaterThanOrEqual(itemMapEndsAt[1]! - 100);
     expect(itemMapStartsAt['3']).toBeGreaterThanOrEqual(
-      itemMapEndsAt['2'] - 100,
+      itemMapEndsAt[2]! - 100,
     );
   });
 });
diff --git a/packages/docusaurus-utils/src/__tests__/webpackUtils.test.ts b/packages/docusaurus-utils/src/__tests__/webpackUtils.test.ts
index f4ce3578bf1b..3d2c70f68924 100644
--- a/packages/docusaurus-utils/src/__tests__/webpackUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/webpackUtils.test.ts
@@ -10,7 +10,7 @@ import {getFileLoaderUtils} from '../webpackUtils';
 describe('getFileLoaderUtils()', () => {
   it('plugin svgo/removeViewBox and removeTitle should be disabled', () => {
     const {oneOf} = getFileLoaderUtils().rules.svg();
-    expect(oneOf[0].use).toContainEqual(
+    expect(oneOf![0]!.use).toContainEqual(
       expect.objectContaining({
         loader: require.resolve('@svgr/webpack'),
         options: expect.objectContaining({
diff --git a/packages/docusaurus/src/client/__tests__/flat.test.ts b/packages/docusaurus/src/client/__tests__/flat.test.ts
index 54c252393dd1..358a0c547d16 100644
--- a/packages/docusaurus/src/client/__tests__/flat.test.ts
+++ b/packages/docusaurus/src/client/__tests__/flat.test.ts
@@ -46,7 +46,7 @@ describe('flat', () => {
       expect(
         flat({
           foo: {
-            bar: value,
+            bar: value as string,
           },
         }),
       ).toEqual({
diff --git a/packages/docusaurus/src/client/__tests__/normalizeLocation.test.ts b/packages/docusaurus/src/client/__tests__/normalizeLocation.test.ts
index fad94198575c..fcc23ba63cd3 100644
--- a/packages/docusaurus/src/client/__tests__/normalizeLocation.test.ts
+++ b/packages/docusaurus/src/client/__tests__/normalizeLocation.test.ts
@@ -7,13 +7,14 @@
 
 import {jest} from '@jest/globals';
 import normalizeLocation from '../normalizeLocation';
+import type {Location} from 'history';
 
 describe('normalizeLocation', () => {
   it('rewrites locations with index.html', () => {
     expect(
       normalizeLocation({
         pathname: '/index.html',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/',
     });
@@ -23,7 +24,7 @@ describe('normalizeLocation', () => {
         pathname: '/docs/introduction/index.html',
         search: '?search=foo',
         hash: '#features',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/docs/introduction',
       search: '?search=foo',
@@ -35,7 +36,7 @@ describe('normalizeLocation', () => {
         pathname: '/index.html',
         search: '',
         hash: '#features',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/',
       search: '',
@@ -47,7 +48,7 @@ describe('normalizeLocation', () => {
     expect(
       normalizeLocation({
         pathname: '/docs/installation.html',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/docs/installation',
     });
@@ -56,7 +57,7 @@ describe('normalizeLocation', () => {
         pathname: '/docs/introduction/foo.html',
         search: '',
         hash: '#bar',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/docs/introduction/foo',
       search: '',
@@ -65,7 +66,7 @@ describe('normalizeLocation', () => {
   });
 
   it('does not strip extension if the route location has one', () => {
-    expect(normalizeLocation({pathname: '/page.html'})).toEqual({
+    expect(normalizeLocation({pathname: '/page.html'} as Location)).toEqual({
       pathname: '/page.html',
     });
   });
@@ -78,7 +79,7 @@ describe('normalizeLocation', () => {
         pathname: '/docs/introduction',
         search: '',
         hash: '#features',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/docs/introduction',
       search: '',
@@ -91,7 +92,7 @@ describe('normalizeLocation', () => {
         pathname: '/docs/introduction',
         search: '',
         hash: '#features',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/docs/introduction',
       search: '',
@@ -102,7 +103,7 @@ describe('normalizeLocation', () => {
     expect(
       normalizeLocation({
         pathname: '/',
-      }),
+      } as Location),
     ).toEqual({
       pathname: '/',
     });
diff --git a/packages/docusaurus/src/client/exports/__tests__/Interpolate.test.tsx b/packages/docusaurus/src/client/exports/__tests__/Interpolate.test.tsx
index 57f944d58b8f..d21b296f1253 100644
--- a/packages/docusaurus/src/client/exports/__tests__/Interpolate.test.tsx
+++ b/packages/docusaurus/src/client/exports/__tests__/Interpolate.test.tsx
@@ -31,7 +31,7 @@ describe('interpolate', () => {
       object: {hello: 'world'},
       array: ['Hello'],
     };
-    // Do we need to improve the JS type -> String conversion logic here?
+    // @ts-expect-error: test
     expect(interpolate(text, values)).toMatchInlineSnapshot(
       `"42 Hello [object Object] Hello"`,
     );
@@ -52,6 +52,7 @@ describe('interpolate', () => {
     // Should we emit warnings in such case?
     const text = 'Hello {name} how are you {unprovidedValue}?';
     const values = {name: 'Sébastien', extraValue: 'today'};
+    // @ts-expect-error: test
     expect(interpolate(text, values)).toMatchInlineSnapshot(
       `"Hello Sébastien how are you {unprovidedValue}?"`,
     );
@@ -61,6 +62,7 @@ describe('interpolate', () => {
     // Should we emit warnings in such case?
     const text = 'Hello {name} how are you {day}?';
     expect(interpolate(text)).toEqual(text);
+    // @ts-expect-error: test
     expect(interpolate(text, {})).toEqual(text);
   });
 
@@ -84,6 +86,7 @@ describe('interpolate', () => {
       extraUselessValue1: <div>test</div>,
       extraUselessValue2: 'hi',
     };
+    // @ts-expect-error: test
     expect(interpolate(text, values)).toMatchSnapshot();
   });
 });
@@ -133,6 +136,7 @@ describe('<Interpolate>', () => {
       `"The Docusaurus <Interpolate> component only accept simple string values. Received: React element"`,
     );
     expect(() =>
+      // @ts-expect-error: test
       renderer.create(<Interpolate>{null}</Interpolate>),
     ).toThrowErrorMatchingInlineSnapshot(
       `"The Docusaurus <Interpolate> component only accept simple string values. Received: object"`,
diff --git a/packages/docusaurus/src/client/exports/__tests__/useBaseUrl.test.tsx b/packages/docusaurus/src/client/exports/__tests__/useBaseUrl.test.tsx
index 5478f7c358f9..1c6724da3069 100644
--- a/packages/docusaurus/src/client/exports/__tests__/useBaseUrl.test.tsx
+++ b/packages/docusaurus/src/client/exports/__tests__/useBaseUrl.test.tsx
@@ -28,7 +28,7 @@ describe('useBaseUrl', () => {
         baseUrl: '/',
         url: 'https://docusaurus.io',
       },
-    });
+    } as DocusaurusContext);
 
     expect(mockUseBaseUrl('hello')).toBe('/hello');
     expect(mockUseBaseUrl('/hello')).toBe('/hello');
@@ -56,7 +56,7 @@ describe('useBaseUrl', () => {
         baseUrl: '/docusaurus/',
         url: 'https://docusaurus.io',
       },
-    });
+    } as DocusaurusContext);
 
     expect(mockUseBaseUrl('')).toBe('');
     expect(mockUseBaseUrl('hello')).toBe('/docusaurus/hello');
@@ -97,7 +97,7 @@ describe('useBaseUrlUtils().withBaseUrl()', () => {
         baseUrl: '/',
         url: 'https://docusaurus.io',
       },
-    });
+    } as DocusaurusContext);
 
     expect(withBaseUrl('hello')).toBe('/hello');
     expect(withBaseUrl('/hello')).toBe('/hello');
@@ -125,7 +125,7 @@ describe('useBaseUrlUtils().withBaseUrl()', () => {
         baseUrl: '/docusaurus/',
         url: 'https://docusaurus.io',
       },
-    });
+    } as DocusaurusContext);
 
     expect(withBaseUrl('hello')).toBe('/docusaurus/hello');
     expect(withBaseUrl('/hello')).toBe('/docusaurus/hello');
diff --git a/packages/docusaurus/src/server/plugins/__tests__/index.test.ts b/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
index 7e3ae0f428e2..148e20fa46a6 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
@@ -7,6 +7,7 @@
 
 import path from 'path';
 import {loadPlugins} from '..';
+import type {Props} from '@docusaurus/types';
 
 describe('loadPlugins', () => {
   it('loads plugins', async () => {
@@ -16,7 +17,6 @@ describe('loadPlugins', () => {
         siteDir,
         generatedFilesDir: path.join(siteDir, '.docusaurus'),
         outDir: path.join(siteDir, 'build'),
-        // @ts-expect-error: good enough
         siteConfig: {
           baseUrl: '/',
           trailingSlash: true,
@@ -51,7 +51,7 @@ describe('loadPlugins', () => {
           ],
         },
         siteConfigPath: path.join(siteDir, 'docusaurus.config.js'),
-      }),
+      } as unknown as Props),
     ).resolves.toMatchSnapshot();
   });
 });
diff --git a/packages/docusaurus/src/server/plugins/__tests__/init.test.ts b/packages/docusaurus/src/server/plugins/__tests__/init.test.ts
index 30fe4cb603a9..249b5af2bf54 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/init.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/init.test.ts
@@ -24,14 +24,14 @@ describe('initPlugins', () => {
     expect(context.siteConfig.plugins).toHaveLength(4);
     expect(plugins).toHaveLength(8);
 
-    expect(plugins[0].name).toBe('preset-plugin1');
-    expect(plugins[1].name).toBe('preset-plugin2');
-    expect(plugins[2].name).toBe('preset-theme1');
-    expect(plugins[3].name).toBe('preset-theme2');
-    expect(plugins[4].name).toBe('first-plugin');
-    expect(plugins[5].name).toBe('second-plugin');
-    expect(plugins[6].name).toBe('third-plugin');
-    expect(plugins[7].name).toBe('fourth-plugin');
+    expect(plugins[0]!.name).toBe('preset-plugin1');
+    expect(plugins[1]!.name).toBe('preset-plugin2');
+    expect(plugins[2]!.name).toBe('preset-theme1');
+    expect(plugins[3]!.name).toBe('preset-theme2');
+    expect(plugins[4]!.name).toBe('first-plugin');
+    expect(plugins[5]!.name).toBe('second-plugin');
+    expect(plugins[6]!.name).toBe('third-plugin');
+    expect(plugins[7]!.name).toBe('fourth-plugin');
     expect(context.siteConfig.themeConfig).toEqual({a: 1});
   });
 
diff --git a/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts b/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts
index a6315f59a813..e01417689a12 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts
@@ -8,12 +8,11 @@
 import {ensureUniquePluginInstanceIds} from '../pluginIds';
 import type {InitializedPlugin} from '@docusaurus/types';
 
-function createTestPlugin(name: string, id?: string): InitializedPlugin {
-  // @ts-expect-error: good enough for tests
+function createTestPlugin(name: string, id?: string) {
   return {
     name,
-    options: {id},
-  };
+    options: {id: id ?? 'default'},
+  } as InitializedPlugin;
 }
 
 describe('ensureUniquePluginInstanceIds', () => {
diff --git a/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts b/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts
index 10d50a29506a..c91709df62df 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts
@@ -62,7 +62,7 @@ describe('loadPresets', () => {
           [path.join(__dirname, '__fixtures__/presets/preset-plugins.js')],
         ],
       },
-    } as Partial<LoadContext>;
+    } as unknown as LoadContext;
     const presets = await loadPresets(context);
     expect(presets).toMatchSnapshot();
   });
@@ -78,7 +78,7 @@ describe('loadPresets', () => {
           ],
         ],
       },
-    } as Partial<LoadContext>;
+    } as unknown as LoadContext;
     const presets = await loadPresets(context);
     expect(presets).toMatchSnapshot();
   });
@@ -98,7 +98,7 @@ describe('loadPresets', () => {
           ],
         ],
       },
-    } as Partial<LoadContext>;
+    } as unknown as LoadContext;
     const presets = await loadPresets(context);
     expect(presets).toMatchSnapshot();
   });
diff --git a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
index f34318cd4707..7ced1c70b5c2 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
@@ -20,6 +20,7 @@ import {
 } from '../translations';
 import type {
   InitializedPlugin,
+  LoadedPlugin,
   TranslationFile,
   TranslationFileContent,
 } from '@docusaurus/types';
@@ -399,7 +400,7 @@ describe('writePluginTranslations', () => {
           options: {
             id: 'my-plugin-id',
           },
-        },
+        } as LoadedPlugin,
 
         options: {},
       }),
@@ -426,11 +427,10 @@ describe('localizePluginTranslationFile', () => {
       siteDir,
       locale: 'fr',
       translationFile,
-      // @ts-expect-error: enough for this test
       plugin: {
         name: 'my-plugin-name',
         options: {},
-      },
+      } as LoadedPlugin,
     });
 
     expect(localizedTranslationFile).toEqual(translationFile);
@@ -466,11 +466,10 @@ describe('localizePluginTranslationFile', () => {
       siteDir,
       locale: 'fr',
       translationFile,
-      // @ts-expect-error: enough for this test
       plugin: {
         name: 'my-plugin-name',
         options: {},
-      },
+      } as LoadedPlugin,
     });
 
     expect(localizedTranslationFile).toEqual({
@@ -521,25 +520,30 @@ describe('readCodeTranslationFileContent', () => {
 
   it('fails for invalid translation file content', async () => {
     await expect(() =>
+      // @ts-expect-error: test
       testReadTranslation('HEY'),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       `""value" must be of type object"`,
     );
     await expect(() =>
+      // @ts-expect-error: test
       testReadTranslation(42),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       `""value" must be of type object"`,
     );
     await expect(() =>
+      // @ts-expect-error: test
       testReadTranslation({key: {description: 'no message'}}),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`""key.message" is required"`);
     await expect(() =>
+      // @ts-expect-error: test
       testReadTranslation({key: {message: 42}}),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       `""key.message" must be a string"`,
     );
     await expect(() =>
       testReadTranslation({
+        // @ts-expect-error: test
         key: {message: 'Message', description: 42},
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(
diff --git a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
index e06bc5f57d1f..ac74f839ea2e 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
@@ -15,7 +15,7 @@ import {
   extractSiteSourceCodeTranslations,
 } from '../translationsExtractor';
 import {getBabelOptions} from '../../../webpack/utils';
-import type {InitializedPlugin} from '@docusaurus/types';
+import type {InitializedPlugin, LoadedPlugin} from '@docusaurus/types';
 
 const TestBabelOptions = getBabelOptions({
   isServer: true,
@@ -693,7 +693,7 @@ export default function MyComponent(props: Props) {
       plugin1,
       plugin2,
       {name: 'dummy', options: {}, version: {type: 'synthetic'}} as const,
-    ];
+    ] as LoadedPlugin[];
     const translations = await extractSiteSourceCodeTranslations(
       siteDir,
       plugins,
diff --git a/packages/docusaurus/src/webpack/__tests__/base.test.ts b/packages/docusaurus/src/webpack/__tests__/base.test.ts
index 3e39adfda435..469d6a5540a5 100644
--- a/packages/docusaurus/src/webpack/__tests__/base.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/base.test.ts
@@ -63,7 +63,7 @@ describe('babel transpilation exclude logic', () => {
 });
 
 describe('base webpack config', () => {
-  const props: Props = {
+  const props = {
     outDir: '',
     siteDir: path.resolve(__dirname, '__fixtures__', 'base_test_site'),
     siteConfig: {staticDirectories: ['static']},
@@ -98,7 +98,7 @@ describe('base webpack config', () => {
         },
       },
     ],
-  };
+  } as Props;
 
   afterEach(() => {
     jest.restoreAllMocks();
diff --git a/packages/docusaurus/src/webpack/__tests__/server.test.ts b/packages/docusaurus/src/webpack/__tests__/server.test.ts
index b722f46f7dd0..f3207fdc2fe2 100644
--- a/packages/docusaurus/src/webpack/__tests__/server.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/server.test.ts
@@ -15,7 +15,11 @@ describe('webpack production config', () => {
   it('simple', async () => {
     jest.spyOn(console, 'log').mockImplementation(() => {});
     const props = await loadSetup('simple');
-    const config = await createServerConfig({props});
+    const config = await createServerConfig({
+      props,
+      onHeadTagsCollected: () => {},
+      onLinksCollected: () => {},
+    });
     const errors = webpack.validate(config);
     expect(errors).toBeUndefined();
   });
@@ -23,7 +27,11 @@ describe('webpack production config', () => {
   it('custom', async () => {
     jest.spyOn(console, 'log').mockImplementation(() => {});
     const props = await loadSetup('custom');
-    const config = await createServerConfig({props});
+    const config = await createServerConfig({
+      props,
+      onHeadTagsCollected: () => {},
+      onLinksCollected: () => {},
+    });
     const errors = webpack.validate(config);
     expect(errors).toBeUndefined();
   });
diff --git a/packages/docusaurus/src/webpack/__tests__/utils.test.ts b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
index 411ed9180469..f5366ded41c1 100644
--- a/packages/docusaurus/src/webpack/__tests__/utils.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
@@ -60,6 +60,7 @@ describe('extending generated webpack config', () => {
       },
     };
 
+    // @ts-expect-error: Testing an edge-case that we did not write types for
     const configureWebpack: Plugin['configureWebpack'] = (
       generatedConfig,
       isServer,
@@ -125,14 +126,16 @@ describe('extending generated webpack config', () => {
       },
     };
 
-    const createConfigureWebpack: (mergeStrategy?: {
-      [key: string]: 'prepend' | 'append';
-    }) => Plugin['configureWebpack'] = (mergeStrategy) => () => ({
-      module: {
-        rules: [{use: 'zzz'}],
-      },
-      mergeStrategy,
-    });
+    const createConfigureWebpack =
+      (mergeStrategy?: {
+        [key: string]: 'prepend' | 'append';
+      }): Plugin['configureWebpack'] =>
+      () => ({
+        module: {
+          rules: [{use: 'zzz'}],
+        },
+        mergeStrategy,
+      });
 
     const defaultStrategyMergeConfig = applyConfigureWebpack(
       createConfigureWebpack(),
diff --git a/packages/eslint-plugin/src/rules/__tests__/no-untranslated-text.test.ts b/packages/eslint-plugin/src/rules/__tests__/no-untranslated-text.test.ts
index 869605a48c68..dc287f602c3a 100644
--- a/packages/eslint-plugin/src/rules/__tests__/no-untranslated-text.test.ts
+++ b/packages/eslint-plugin/src/rules/__tests__/no-untranslated-text.test.ts
@@ -8,12 +8,7 @@
 import rule from '../no-untranslated-text';
 import {getCommonValidTests, RuleTester} from './testUtils';
 
-const errorsJSX = [
-  {messageId: 'translateChildren', type: 'JSXElement'},
-] as const;
-const errorsJSXFragment = [
-  {messageId: 'translateChildren', type: 'JSXFragment'},
-];
+const errorsJSX = [{messageId: 'translateChildren'}] as const;
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',
@@ -110,7 +105,7 @@ ruleTester.run('no-untranslated-text', rule, {
     },
     {
       code: '<>text</>',
-      errors: errorsJSXFragment,
+      errors: errorsJSX,
     },
     {
       code: '<Component>· — ×</Component>',
diff --git a/packages/eslint-plugin/src/rules/__tests__/string-literal-i18n-messages.test.ts b/packages/eslint-plugin/src/rules/__tests__/string-literal-i18n-messages.test.ts
index d836979acd22..066017931d7a 100644
--- a/packages/eslint-plugin/src/rules/__tests__/string-literal-i18n-messages.test.ts
+++ b/packages/eslint-plugin/src/rules/__tests__/string-literal-i18n-messages.test.ts
@@ -8,12 +8,8 @@
 import rule from '../string-literal-i18n-messages';
 import {getCommonValidTests, RuleTester} from './testUtils';
 
-const errorsJSX = [
-  {messageId: 'translateChildren', type: 'JSXElement'},
-] as const;
-const errorsFunc = [
-  {messageId: 'translateArg', type: 'CallExpression'},
-] as const;
+const errorsJSX = [{messageId: 'translateChildren'}] as const;
+const errorsFunc = [{messageId: 'translateArg'}] as const;
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',

From d50fe3b670a55688e5593a44f753bc5b6e75eb80 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Wed, 25 May 2022 14:01:10 +0800
Subject: [PATCH 06/43] test: fix ALL type errors in tests (#7487)

---
 .../src/__tests__/index.test.ts               |  13 ++-
 .../src/__tests__/options.test.ts             |  11 +-
 .../__snapshots__/translations.test.ts.snap   |  66 ++++++++++-
 .../src/__tests__/index.test.ts               |  37 ++++---
 .../src/__tests__/options.test.ts             |   8 +-
 .../src/__tests__/translations.test.ts        |  10 +-
 .../client/__tests__/docsClientUtils.test.ts  |  47 ++++++--
 .../src/markdown/__tests__/linkify.test.ts    |   8 +-
 .../src/sidebars/__tests__/generator.test.ts  | 103 +++++++++++++-----
 .../src/sidebars/__tests__/index.test.ts      |  17 +--
 .../sidebars/__tests__/normalization.test.ts  |   5 +
 .../sidebars/__tests__/postProcessor.test.ts  |  17 +--
 .../src/sidebars/__tests__/processor.test.ts  |   8 +-
 .../src/sidebars/postProcessor.ts             |   2 +-
 .../src/__tests__/options.test.ts             |  18 ++-
 .../src/__tests__/validateThemeConfig.test.ts |   4 +-
 .../src/theme-classic.d.ts                    |   6 +-
 .../src/theme/Tabs/__tests__/index.test.tsx   |   3 +
 .../src/utils/__tests__/generalUtils.test.tsx |   2 +-
 .../__tests__/useAlternatePageUtils.test.tsx  |   8 +-
 .../utils/__tests__/useLocalPathname.test.tsx |   4 +-
 .../utils/__tests__/usePluralForm.test.tsx    |   5 +-
 .../exports/__tests__/useGlobalData.test.tsx  |  46 ++++++--
 .../swizzle/__tests__/actions.test.ts         |   2 +-
 .../commands/swizzle/__tests__/index.test.ts  |   6 +-
 .../server/__tests__/clientModules.test.ts    |  12 +-
 .../server/__tests__/configValidation.test.ts |  25 +++--
 .../src/server/__tests__/htmlTags.test.ts     |  23 ++--
 .../src/server/__tests__/i18n.test.ts         |   2 +-
 .../src/server/__tests__/siteMetadata.test.ts |   5 +-
 .../src/server/__tests__/utils.test.ts        |   4 +-
 .../server/plugins/__tests__/index.test.ts    |  37 ++++---
 .../server/plugins/__tests__/presets.test.ts  |   3 +-
 .../__tests__/translations.test.ts            |  11 +-
 .../__tests__/translationsExtractor.test.ts   |   2 +-
 .../src/webpack/__tests__/utils.test.ts       |   8 +-
 .../webpack/aliases/__tests__/index.test.ts   |   3 +-
 37 files changed, 407 insertions(+), 184 deletions(-)

diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
index 0c49808e9c33..47d4b98fd4e0 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
@@ -11,9 +11,15 @@ import {normalizePluginOptions} from '@docusaurus/utils-validation';
 import {posixPath, getFileCommitDate} from '@docusaurus/utils';
 import pluginContentBlog from '../index';
 import {validateOptions} from '../options';
-import type {DocusaurusConfig, LoadContext, I18n} from '@docusaurus/types';
+import type {
+  DocusaurusConfig,
+  LoadContext,
+  I18n,
+  Validate,
+} from '@docusaurus/types';
 import type {
   BlogPost,
+  Options,
   PluginOptions,
   EditUrlFunction,
 } from '@docusaurus/plugin-content-blog';
@@ -77,7 +83,10 @@ const getPlugin = async (
       i18n,
     } as LoadContext,
     validateOptions({
-      validate: normalizePluginOptions,
+      validate: normalizePluginOptions as Validate<
+        Options | undefined,
+        PluginOptions
+      >,
       options: {
         path: PluginPath,
         editUrl: BaseEditUrl,
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
index 61f0da6c99c0..92eae01ae547 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
@@ -7,10 +7,17 @@
 
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
 import {validateOptions, DEFAULT_OPTIONS} from '../options';
-import type {Options} from '@docusaurus/plugin-content-blog';
+import type {Options, PluginOptions} from '@docusaurus/plugin-content-blog';
+import type {Validate} from '@docusaurus/types';
 
 function testValidate(options?: Options) {
-  return validateOptions({validate: normalizePluginOptions, options});
+  return validateOptions({
+    validate: normalizePluginOptions as Validate<
+      Options | undefined,
+      PluginOptions
+    >,
+    options,
+  });
 }
 
 // The type of remark/rehype plugins can be either function, object or array
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap
index b952835b06d0..4098aeb59399 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/translations.test.ts.snap
@@ -84,11 +84,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
 {
   "loadedVersions": [
     {
+      "badge": true,
+      "banner": null,
+      "className": "",
       "contentPath": "any",
       "contentPathLocalized": "any",
       "docs": [
         {
           "description": "doc1 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc1 title",
@@ -101,12 +105,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc1 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc2 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc2 title",
@@ -119,12 +126,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc2 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc3 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc3 title",
@@ -137,12 +147,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc3 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc4 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc4 title",
@@ -155,12 +168,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc4 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc5 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc5 title",
@@ -173,14 +189,16 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc5 title",
           "unversionedId": "any",
           "version": "any",
         },
       ],
+      "drafts": [],
       "isLast": true,
       "label": "current label (translated)",
-      "mainDocId": "",
       "path": "/docs/",
       "routePriority": undefined,
       "sidebarFilePath": "any",
@@ -188,6 +206,7 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         "docs": [
           {
             "collapsed": false,
+            "collapsible": true,
             "items": [
               {
                 "id": "doc1",
@@ -233,14 +252,19 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           },
         ],
       },
+      "tagsPath": "/tags/",
       "versionName": "current",
     },
     {
+      "badge": true,
+      "banner": null,
+      "className": "",
       "contentPath": "any",
       "contentPathLocalized": "any",
       "docs": [
         {
           "description": "doc1 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc1 title",
@@ -253,12 +277,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc1 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc2 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc2 title",
@@ -271,12 +298,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc2 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc3 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc3 title",
@@ -289,12 +319,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc3 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc4 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc4 title",
@@ -307,12 +340,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc4 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc5 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc5 title",
@@ -325,14 +361,16 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc5 title",
           "unversionedId": "any",
           "version": "any",
         },
       ],
+      "drafts": [],
       "isLast": true,
       "label": "2.0.0 label (translated)",
-      "mainDocId": "",
       "path": "/docs/",
       "routePriority": undefined,
       "sidebarFilePath": "any",
@@ -340,6 +378,7 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         "docs": [
           {
             "collapsed": false,
+            "collapsible": true,
             "items": [
               {
                 "id": "doc1",
@@ -385,14 +424,19 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           },
         ],
       },
+      "tagsPath": "/tags/",
       "versionName": "2.0.0",
     },
     {
+      "badge": true,
+      "banner": null,
+      "className": "",
       "contentPath": "any",
       "contentPathLocalized": "any",
       "docs": [
         {
           "description": "doc1 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc1 title",
@@ -405,12 +449,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc1 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc2 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc2 title",
@@ -423,12 +470,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc2 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc3 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc3 title",
@@ -441,12 +491,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc3 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc4 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc4 title",
@@ -459,12 +512,15 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc4 title",
           "unversionedId": "any",
           "version": "any",
         },
         {
           "description": "doc5 description",
+          "draft": false,
           "editUrl": "any",
           "frontMatter": {
             "sidebar_label": "doc5 title",
@@ -477,14 +533,16 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           "previous": undefined,
           "slug": "any",
           "source": "any",
+          "sourceDirName": "",
+          "tags": [],
           "title": "doc5 title",
           "unversionedId": "any",
           "version": "any",
         },
       ],
+      "drafts": [],
       "isLast": true,
       "label": "1.0.0 label (translated)",
-      "mainDocId": "",
       "path": "/docs/",
       "routePriority": undefined,
       "sidebarFilePath": "any",
@@ -492,6 +550,7 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
         "docs": [
           {
             "collapsed": false,
+            "collapsible": true,
             "items": [
               {
                 "id": "doc1",
@@ -537,6 +596,7 @@ exports[`translateLoadedContent returns translated loaded content 1`] = `
           },
         ],
       },
+      "tagsPath": "/tags/",
       "versionName": "1.0.0",
     },
   ],
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 2f83e3f0b576..746288ca95e9 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -25,9 +25,11 @@ import {DisabledSidebars} from '../sidebars';
 import * as cliDocs from '../cli';
 import {validateOptions} from '../options';
 
-import type {RouteConfig} from '@docusaurus/types';
+import type {RouteConfig, Validate, Plugin} from '@docusaurus/types';
 import type {
   LoadedVersion,
+  Options,
+  PluginOptions,
   PropSidebarItemLink,
 } from '@docusaurus/plugin-content-docs';
 import type {
@@ -133,7 +135,7 @@ describe('sidebar', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           sidebarPath,
         },
@@ -150,7 +152,7 @@ describe('sidebar', () => {
       const plugin = await pluginContentDocs(
         context,
         validateOptions({
-          validate: normalizePluginOptions,
+          validate: normalizePluginOptions as Validate<Options, PluginOptions>,
           options: {
             sidebarPath: 'wrong-path-sidebar.json',
           },
@@ -173,7 +175,7 @@ describe('sidebar', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           sidebarPath: undefined,
         },
@@ -191,7 +193,7 @@ describe('sidebar', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           sidebarPath: false,
         },
@@ -212,7 +214,10 @@ describe('empty/no docs website', () => {
     await fs.ensureDir(path.join(siteDir, 'docs'));
     const plugin = await pluginContentDocs(
       context,
-      validateOptions({validate: normalizePluginOptions, options: {}}),
+      validateOptions({
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
+        options: {},
+      }),
     );
     await expect(
       plugin.loadContent!(),
@@ -227,7 +232,7 @@ describe('empty/no docs website', () => {
       pluginContentDocs(
         context,
         validateOptions({
-          validate: normalizePluginOptions,
+          validate: normalizePluginOptions as Validate<Options, PluginOptions>,
           options: {
             path: 'path/does/not/exist',
           },
@@ -245,7 +250,7 @@ describe('simple website', () => {
     const context = await loadContext({siteDir});
     const sidebarPath = path.join(siteDir, 'sidebars.json');
     const options = validateOptions({
-      validate: normalizePluginOptions,
+      validate: normalizePluginOptions as Validate<Options, PluginOptions>,
       options: {
         path: 'docs',
         sidebarPath,
@@ -299,7 +304,7 @@ describe('simple website', () => {
     const content = await plugin.loadContent?.();
 
     const config = applyConfigureWebpack(
-      plugin.configureWebpack,
+      plugin.configureWebpack as NonNullable<Plugin['configureWebpack']>,
       {
         entry: './src/index.js',
         output: {
@@ -352,7 +357,7 @@ describe('versioned website', () => {
     const sidebarPath = path.join(siteDir, 'sidebars.json');
     const routeBasePath = 'docs';
     const options = validateOptions({
-      validate: normalizePluginOptions,
+      validate: normalizePluginOptions as Validate<Options, PluginOptions>,
       options: {
         routeBasePath,
         sidebarPath,
@@ -478,7 +483,7 @@ describe('versioned website (community)', () => {
     const routeBasePath = 'community';
     const pluginId = 'community';
     const options = validateOptions({
-      validate: normalizePluginOptions,
+      validate: normalizePluginOptions as Validate<Options, PluginOptions>,
       options: {
         id: 'community',
         path: 'community',
@@ -581,7 +586,7 @@ describe('site with doc label', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           path: 'docs',
           sidebarPath,
@@ -626,7 +631,7 @@ describe('site with full autogenerated sidebar', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           path: 'docs',
         },
@@ -681,7 +686,7 @@ describe('site with partial autogenerated sidebars', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           path: 'docs',
           sidebarPath: path.join(
@@ -737,7 +742,7 @@ describe('site with partial autogenerated sidebars 2 (fix #4638)', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           path: 'docs',
           sidebarPath: path.join(
@@ -774,7 +779,7 @@ describe('site with custom sidebar items generator', () => {
     const plugin = await pluginContentDocs(
       context,
       validateOptions({
-        validate: normalizePluginOptions,
+        validate: normalizePluginOptions as Validate<Options, PluginOptions>,
         options: {
           path: 'docs',
           sidebarItemsGenerator,
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
index ea4ebf043114..534eb3712000 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
@@ -13,14 +13,18 @@ import {
   DefaultNumberPrefixParser,
   DisabledNumberPrefixParser,
 } from '../numberPrefix';
-import type {Options} from '@docusaurus/plugin-content-docs';
+import type {Options, PluginOptions} from '@docusaurus/plugin-content-docs';
+import type {Validate} from '@docusaurus/types';
 
 // The type of remark/rehype plugins can be function/object
 const markdownPluginsFunctionStub = () => {};
 const markdownPluginsObjectStub = {};
 
 function testValidate(options: Options) {
-  return validateOptions({validate: normalizePluginOptions, options});
+  return validateOptions({
+    validate: normalizePluginOptions as Validate<Options, PluginOptions>,
+    options,
+  });
 }
 
 const defaultOptions = {
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
index a79409ba8d84..fb099e8eb63d 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
@@ -19,6 +19,9 @@ import type {
 
 function createSampleDoc(doc: Pick<DocMetadata, 'id'>): DocMetadata {
   return {
+    sourceDirName: '',
+    draft: false,
+    tags: [],
     editUrl: 'any',
     lastUpdatedAt: 0,
     lastUpdatedBy: 'any',
@@ -44,12 +47,16 @@ function createSampleVersion(
   return {
     label: `${version.versionName} label`,
     path: '/docs/',
-    mainDocId: '',
     routePriority: undefined,
     sidebarFilePath: 'any',
     isLast: true,
     contentPath: 'any',
     contentPathLocalized: 'any',
+    tagsPath: '/tags/',
+    banner: null,
+    badge: true,
+    className: '',
+    drafts: [],
     docs: [
       createSampleDoc({id: 'doc1'}),
       createSampleDoc({id: 'doc2'}),
@@ -63,6 +70,7 @@ function createSampleVersion(
           type: 'category',
           label: 'Getting started',
           collapsed: false,
+          collapsible: true,
           link: {
             type: 'generated-index',
             slug: '/category/getting-started-index-slug',
diff --git a/packages/docusaurus-plugin-content-docs/src/client/__tests__/docsClientUtils.test.ts b/packages/docusaurus-plugin-content-docs/src/client/__tests__/docsClientUtils.test.ts
index 093aaad1db93..16fc4e7a9c80 100644
--- a/packages/docusaurus-plugin-content-docs/src/client/__tests__/docsClientUtils.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/client/__tests__/docsClientUtils.test.ts
@@ -17,6 +17,7 @@ import type {
   GlobalPluginData,
   GlobalVersion,
   ActivePlugin,
+  GlobalDoc,
 } from '@docusaurus/plugin-content-docs/client';
 
 describe('docsClientUtils', () => {
@@ -25,10 +26,12 @@ describe('docsClientUtils', () => {
       pluginIosId: {
         path: '/ios',
         versions: [],
+        breadcrumbs: true,
       },
       pluginAndroidId: {
         path: '/android',
         versions: [],
+        breadcrumbs: true,
       },
     };
 
@@ -48,7 +51,7 @@ describe('docsClientUtils', () => {
 
     const activePluginIos: ActivePlugin = {
       pluginId: 'pluginIosId',
-      pluginData: data.pluginIosId,
+      pluginData: data.pluginIosId!,
     };
     expect(getActivePlugin(data, '/ios')).toEqual(activePluginIos);
     expect(getActivePlugin(data, '/ios/')).toEqual(activePluginIos);
@@ -56,38 +59,42 @@ describe('docsClientUtils', () => {
 
     const activePluginAndroid: ActivePlugin = {
       pluginId: 'pluginAndroidId',
-      pluginData: data.pluginAndroidId,
+      pluginData: data.pluginAndroidId!,
     };
     expect(getActivePlugin(data, '/android')).toEqual(activePluginAndroid);
     expect(getActivePlugin(data, '/android/')).toEqual(activePluginAndroid);
     expect(getActivePlugin(data, '/android/ijk')).toEqual(activePluginAndroid);
 
     // https://github.com/facebook/docusaurus/issues/6434
-    const onePluginAtRoot = {
+    const onePluginAtRoot: {[key: string]: GlobalPluginData} = {
       pluginIosId: {
         path: '/',
         versions: [],
+        breadcrumbs: true,
       },
       pluginAndroidId: {
         path: '/android',
         versions: [],
+        breadcrumbs: true,
       },
     };
-    expect(getActivePlugin(onePluginAtRoot, '/android/foo').pluginId).toBe(
+    expect(getActivePlugin(onePluginAtRoot, '/android/foo')!.pluginId).toBe(
       'pluginAndroidId',
     );
-    const onePluginAtRootReversed = {
+    const onePluginAtRootReversed: {[key: string]: GlobalPluginData} = {
       pluginAndroidId: {
         path: '/android',
         versions: [],
+        breadcrumbs: true,
       },
       pluginIosId: {
         path: '/',
         versions: [],
+        breadcrumbs: true,
       },
     };
     expect(
-      getActivePlugin(onePluginAtRootReversed, '/android/foo').pluginId,
+      getActivePlugin(onePluginAtRootReversed, '/android/foo')!.pluginId,
     ).toBe('pluginAndroidId');
   });
 
@@ -100,6 +107,7 @@ describe('docsClientUtils', () => {
         isLast: false,
         docs: [],
         mainDocId: '???',
+        draftIds: [],
       },
       {
         name: 'version2',
@@ -108,6 +116,7 @@ describe('docsClientUtils', () => {
         isLast: true,
         docs: [],
         mainDocId: '???',
+        draftIds: [],
       },
       {
         name: 'version3',
@@ -116,6 +125,7 @@ describe('docsClientUtils', () => {
         isLast: false,
         docs: [],
         mainDocId: '???',
+        draftIds: [],
       },
     ];
 
@@ -123,6 +133,7 @@ describe('docsClientUtils', () => {
       getLatestVersion({
         path: '???',
         versions,
+        breadcrumbs: true,
       }),
     ).toEqual(versions[1]);
   });
@@ -138,6 +149,7 @@ describe('docsClientUtils', () => {
           path: '/docs/next',
           docs: [],
           mainDocId: '???',
+          draftIds: [],
         },
         {
           name: 'version2',
@@ -146,6 +158,7 @@ describe('docsClientUtils', () => {
           path: '/docs',
           docs: [],
           mainDocId: '???',
+          draftIds: [],
         },
         {
           name: 'version1',
@@ -154,8 +167,10 @@ describe('docsClientUtils', () => {
           path: '/docs/version1',
           docs: [],
           mainDocId: '???',
+          draftIds: [],
         },
       ],
+      breadcrumbs: true,
     };
 
     expect(getActiveVersion(data, '/someUnknownPath')).toBeUndefined();
@@ -191,7 +206,8 @@ describe('docsClientUtils', () => {
           id: 'doc2',
           path: '/docs/next/doc2',
         },
-      ],
+      ] as GlobalDoc[],
+      draftIds: [],
     };
 
     const version2: GlobalVersion = {
@@ -209,7 +225,8 @@ describe('docsClientUtils', () => {
           id: 'doc2',
           path: '/docs/doc2',
         },
-      ],
+      ] as GlobalDoc[],
+      draftIds: [],
     };
 
     const version1: GlobalVersion = {
@@ -223,7 +240,8 @@ describe('docsClientUtils', () => {
           id: 'doc1',
           path: '/docs/version1/',
         },
-      ],
+      ] as GlobalDoc[],
+      draftIds: [],
     };
 
     // Shuffle, because order shouldn't matter
@@ -236,6 +254,7 @@ describe('docsClientUtils', () => {
     const data: GlobalPluginData = {
       path: 'docs',
       versions,
+      breadcrumbs: true,
     };
 
     expect(getActiveDocContext(data, '/doesNotExist')).toEqual({
@@ -320,7 +339,8 @@ describe('docsClientUtils', () => {
           id: 'doc2',
           path: '/docs/next/doc2',
         },
-      ],
+      ] as GlobalDoc[],
+      draftIds: [],
     };
 
     const version2: GlobalVersion = {
@@ -338,7 +358,8 @@ describe('docsClientUtils', () => {
           id: 'doc2',
           path: '/docs/doc2',
         },
-      ],
+      ] as GlobalDoc[],
+      draftIds: [],
     };
 
     const version1: GlobalVersion = {
@@ -352,7 +373,8 @@ describe('docsClientUtils', () => {
           id: 'doc1',
           path: '/docs/version1/',
         },
-      ],
+      ] as GlobalDoc[],
+      draftIds: [],
     };
 
     // Shuffle, because order shouldn't matter
@@ -365,6 +387,7 @@ describe('docsClientUtils', () => {
     const data: GlobalPluginData = {
       path: 'docs',
       versions,
+      breadcrumbs: true,
     };
 
     expect(getDocVersionSuggestions(data, '/doesNotExist')).toEqual({
diff --git a/packages/docusaurus-plugin-content-docs/src/markdown/__tests__/linkify.test.ts b/packages/docusaurus-plugin-content-docs/src/markdown/__tests__/linkify.test.ts
index 864d5a39c274..6d3f11a2c427 100644
--- a/packages/docusaurus-plugin-content-docs/src/markdown/__tests__/linkify.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/markdown/__tests__/linkify.test.ts
@@ -28,8 +28,12 @@ function createFakeVersion({
 }): VersionMetadata {
   return {
     versionName,
-    versionLabel: 'Any',
-    versionPath: 'any',
+    label: 'Any',
+    path: 'any',
+    badge: true,
+    banner: null,
+    tagsPath: '/tags/',
+    className: '',
     contentPath,
     contentPathLocalized,
     sidebarFilePath: 'any',
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts
index 9f01f06347b7..43e40938df0e 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/generator.test.ts
@@ -27,10 +27,6 @@ describe('DefaultSidebarItemsGenerator', () => {
         contentPath: 'docs',
       },
       docs: [],
-      options: {
-        sidebarCollapsed: true,
-        sidebarCollapsible: true,
-      },
       categoriesMetadata: {},
       ...params,
     });
@@ -69,6 +65,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           frontMatter: {
             sidebar_label: 'doc1 sidebar label',
           },
+          title: '',
+          unversionedId: 'doc1',
         },
         {
           id: 'doc2',
@@ -76,6 +74,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: 3,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc2',
         },
         {
           id: 'doc3',
@@ -83,6 +83,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: 1,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc3',
         },
         {
           id: 'doc4',
@@ -90,6 +92,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: 1.5,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc4',
         },
         {
           id: 'doc5',
@@ -97,12 +101,12 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc5',
         },
       ],
-      options: {
-        sidebarCollapsed: true,
-        sidebarCollapsible: true,
-      },
+      isCategoryIndex: () => false,
+      categoriesMetadata: {},
     });
 
     expect(sidebarSlice).toMatchSnapshot();
@@ -144,6 +148,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: 0,
           frontMatter: {},
+          title: '',
+          unversionedId: 'intro',
         },
         {
           id: 'tutorials-index',
@@ -151,6 +157,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '01-Tutorials',
           sidebarPosition: 2,
           frontMatter: {},
+          title: 'Tutorials',
+          unversionedId: 'tutorials-index',
         },
         {
           id: 'tutorial2',
@@ -158,6 +166,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '01-Tutorials',
           sidebarPosition: 2,
           frontMatter: {},
+          title: '',
+          unversionedId: 'tutorial2',
         },
         {
           id: 'tutorial1',
@@ -165,12 +175,16 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '01-Tutorials',
           sidebarPosition: 1,
           frontMatter: {},
+          title: '',
+          unversionedId: 'tutorial1',
         },
         {
           id: 'guides-index',
           source: '@site/docs/02-Guides/02-Guides.md', // TODO should we allow to just use "Guides.md" to have an index?
           sourceDirName: '02-Guides',
           frontMatter: {},
+          title: 'Guides',
+          unversionedId: 'guides-index',
         },
         {
           id: 'guide2',
@@ -178,6 +192,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '02-Guides',
           sidebarPosition: 2,
           frontMatter: {},
+          title: '',
+          unversionedId: 'guide2',
         },
         {
           id: 'guide1',
@@ -187,6 +203,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           frontMatter: {
             sidebar_class_name: 'foo',
           },
+          title: '',
+          unversionedId: 'guide1',
         },
         {
           id: 'nested-guide',
@@ -194,6 +212,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '02-Guides/01-SubGuides',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'nested-guide',
         },
         {
           id: 'end',
@@ -201,12 +221,10 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: 3,
           frontMatter: {},
+          title: '',
+          unversionedId: 'end',
         },
       ],
-      options: {
-        sidebarCollapsed: true,
-        sidebarCollapsible: true,
-      },
     });
 
     expect(sidebarSlice).toMatchSnapshot();
@@ -249,6 +267,7 @@ describe('DefaultSidebarItemsGenerator', () => {
           title: 'Subsubsubfolder category label',
           sidebarPosition: undefined,
           frontMatter: {},
+          unversionedId: 'doc1',
         },
         {
           id: 'doc2',
@@ -256,6 +275,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: 'subfolder',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc2',
         },
         {
           id: 'doc3',
@@ -263,6 +284,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc2',
         },
         {
           id: 'doc4',
@@ -270,6 +293,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: 'subfolder/subsubfolder',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc4',
         },
         {
           id: 'doc5',
@@ -277,6 +302,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: 'subfolder/subsubfolder/subsubsubfolder',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc5',
         },
         {
           id: 'doc6',
@@ -284,6 +311,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: 'subfolder/subsubfolder/subsubsubfolder2',
           sidebarPosition: undefined,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc6',
         },
         {
           id: 'doc7',
@@ -291,6 +320,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: 'subfolder/subsubfolder/subsubsubfolder3',
           sidebarPosition: 2,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc7',
         },
         {
           id: 'doc8',
@@ -298,12 +329,10 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: 'subfolder/subsubfolder/subsubsubfolder3',
           sidebarPosition: 1,
           frontMatter: {},
+          title: '',
+          unversionedId: 'doc8',
         },
       ],
-      options: {
-        sidebarCollapsed: true,
-        sidebarCollapsible: true,
-      },
     });
 
     expect(sidebarSlice).toMatchSnapshot();
@@ -339,42 +368,51 @@ describe('DefaultSidebarItemsGenerator', () => {
           source: '@site/docs/Category/index.md',
           sourceDirName: 'Category',
           frontMatter: {},
+          title: '',
+          unversionedId: 'parent/doc1',
         },
         {
           id: 'parent/doc2',
           source: '@site/docs/Category/doc2.md',
           sourceDirName: 'Category',
           frontMatter: {},
+          title: '',
+          unversionedId: 'parent/doc2',
         },
         {
           id: 'parent/doc3',
           source: '@site/docs/Category/doc3.md',
           sourceDirName: 'Category',
           frontMatter: {},
+          title: '',
+          unversionedId: 'parent/doc3',
         },
         {
           id: 'parent/doc4',
           source: '@site/docs/Category2/doc1.md',
           sourceDirName: 'Category2',
           frontMatter: {},
+          title: '',
+          unversionedId: 'parent/doc4',
         },
         {
           id: 'parent/doc5',
           source: '@site/docs/Category2/index.md',
           sourceDirName: 'Category2',
           frontMatter: {},
+          title: '',
+          unversionedId: 'parent/doc5',
         },
         {
           id: 'parent/doc6',
           source: '@site/docs/Category2/doc3.md',
           sourceDirName: 'Category2',
           frontMatter: {},
+          title: '',
+          unversionedId: 'parent/doc6',
         },
       ],
-      options: {
-        sidebarCollapsed: true,
-        sidebarCollapsible: true,
-      },
+      isCategoryIndex: () => false,
     });
 
     expect(sidebarSlice).toMatchSnapshot();
@@ -387,7 +425,7 @@ describe('DefaultSidebarItemsGenerator', () => {
         return (
           fileName.replace(
             `${DefaultNumberPrefixParser(
-              directories[0],
+              directories[0]!,
             ).filename.toLowerCase()}-`,
             '',
           ) === 'index'
@@ -409,6 +447,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '.',
           sidebarPosition: 0,
           frontMatter: {},
+          title: '',
+          unversionedId: 'intro',
         },
         {
           id: 'tutorials-index',
@@ -416,6 +456,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '01-Tutorials',
           sidebarPosition: 2,
           frontMatter: {},
+          title: 'Tutorials',
+          unversionedId: 'tutorials-index',
         },
         {
           id: 'tutorial2',
@@ -423,6 +465,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '01-Tutorials',
           sidebarPosition: 2,
           frontMatter: {},
+          title: '',
+          unversionedId: 'tutorial2',
         },
         {
           id: 'tutorial1',
@@ -430,12 +474,16 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '01-Tutorials',
           sidebarPosition: 1,
           frontMatter: {},
+          title: '',
+          unversionedId: 'tutorial1',
         },
         {
           id: 'not-guides-index',
           source: '@site/docs/02-Guides/README.md',
           sourceDirName: '02-Guides',
           frontMatter: {},
+          title: 'Guides',
+          unversionedId: 'not-guides-index',
         },
         {
           id: 'guide2',
@@ -443,6 +491,8 @@ describe('DefaultSidebarItemsGenerator', () => {
           sourceDirName: '02-Guides',
           sidebarPosition: 2,
           frontMatter: {},
+          title: 'guide2',
+          unversionedId: 'guide2',
         },
         {
           id: 'guide1',
@@ -452,12 +502,10 @@ describe('DefaultSidebarItemsGenerator', () => {
           frontMatter: {
             sidebar_class_name: 'foo',
           },
+          title: '',
+          unversionedId: 'guide1',
         },
       ],
-      options: {
-        sidebarCollapsed: true,
-        sidebarCollapsible: true,
-      },
     });
 
     expect(sidebarSlice).toMatchSnapshot();
@@ -491,12 +539,9 @@ describe('DefaultSidebarItemsGenerator', () => {
             source: '@site/docs/category/intro.md',
             sourceDirName: 'category',
             frontMatter: {},
+            title: '',
           },
         ],
-        options: {
-          sidebarCollapsed: true,
-          sidebarCollapsible: true,
-        },
       });
 
     expect(() => generateSidebar()).toThrowErrorMatchingInlineSnapshot(`
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/index.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/index.test.ts
index 5a1eed4f1d1b..5981cfefadd6 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/index.test.ts
@@ -11,7 +11,10 @@ import {createSlugger} from '@docusaurus/utils';
 import {loadSidebars, DisabledSidebars} from '../index';
 import {DefaultSidebarItemsGenerator} from '../generator';
 import type {SidebarProcessorParams} from '../types';
-import type {DocMetadata} from '@docusaurus/plugin-content-docs';
+import type {
+  DocMetadata,
+  VersionMetadata,
+} from '@docusaurus/plugin-content-docs';
 
 describe('loadSidebars', () => {
   const fixtureDir = path.join(__dirname, '__fixtures__', 'sidebars');
@@ -25,14 +28,14 @@ describe('loadSidebars', () => {
         id: 'bar',
         frontMatter: {},
       },
-    ],
+    ] as DocMetadata[],
     drafts: [],
     version: {
       path: 'version',
       contentPath: path.join(fixtureDir, 'docs'),
       contentPathLocalized: path.join(fixtureDir, 'docs'),
-    },
-    categoryLabelSlugger: null,
+    } as VersionMetadata,
+    categoryLabelSlugger: {slug: (v) => v},
     sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
   };
   it('sidebars with known sidebar item type', async () => {
@@ -137,7 +140,7 @@ describe('loadSidebars', () => {
           sourceDirName: 'tutorials/tutorial-basics',
           frontMatter: {},
         },
-      ],
+      ] as DocMetadata[],
     });
     expect(result).toMatchSnapshot();
   });
@@ -146,7 +149,7 @@ describe('loadSidebars', () => {
     const sidebarPath = path.join(fixtureDir, 'sidebars-drafts.json');
     const result = await loadSidebars(sidebarPath, {
       ...params,
-      drafts: [{id: 'draft1'}, {id: 'draft2'}, {id: 'draft3'}],
+      drafts: [{id: 'draft1'}, {id: 'draft2'}, {id: 'draft3'}] as DocMetadata[],
       categoryLabelSlugger: createSlugger(),
     });
     expect(result).toMatchSnapshot();
@@ -169,7 +172,7 @@ describe('loadSidebars', () => {
         version: {
           contentPath: path.join(fixtureDir, 'invalid-docs'),
           contentPathLocalized: path.join(fixtureDir, 'invalid-docs'),
-        },
+        } as VersionMetadata,
       }),
     ).rejects.toThrowErrorMatchingInlineSnapshot(`""foo" is not allowed"`);
     expect(consoleWarnMock).toBeCalledWith(
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/normalization.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/normalization.test.ts
index f9413e73f68e..f7f9ad2ee2e8 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/normalization.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/normalization.test.ts
@@ -41,7 +41,9 @@ describe('normalization', () => {
     expect(() =>
       normalizeSidebars({
         sidebar: {
+          // @ts-expect-error: test
           Category: {type: 'autogenerated', dirName: 'foo'},
+          // @ts-expect-error: test
           Category2: {type: 'autogenerated', dirName: 'bar'},
         },
       }),
@@ -55,6 +57,7 @@ describe('normalization', () => {
           'foo',
           {
             Category: {
+              // @ts-expect-error: test
               type: 'category',
               items: ['bar', 'baz'],
             },
@@ -70,6 +73,7 @@ describe('normalization', () => {
         sidebar: [
           'foo',
           {
+            // @ts-expect-error: test
             Category: 'bar',
           },
         ],
@@ -80,6 +84,7 @@ describe('normalization', () => {
 
     expect(() =>
       normalizeSidebars({
+        // @ts-expect-error: test
         sidebar: 'item',
       }),
     ).toThrowErrorMatchingInlineSnapshot(
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/postProcessor.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/postProcessor.test.ts
index 16196c7c3de8..ac897e12ce97 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/postProcessor.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/postProcessor.test.ts
@@ -5,7 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {postProcessSidebars} from '../postProcessor';
+import {
+  postProcessSidebars,
+  type SidebarPostProcessorParams,
+} from '../postProcessor';
 
 describe('postProcess', () => {
   it('transforms category without subitems', () => {
@@ -36,7 +39,7 @@ describe('postProcess', () => {
         sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
         version: {path: 'version'},
         drafts: [],
-      },
+      } as unknown as SidebarPostProcessorParams,
     );
 
     expect(processedSidebar).toMatchSnapshot();
@@ -56,7 +59,7 @@ describe('postProcess', () => {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
           version: {path: 'version'},
           drafts: [],
-        },
+        } as unknown as SidebarPostProcessorParams,
       );
     }).toThrowErrorMatchingInlineSnapshot(
       `"Sidebar category Bad category has neither any subitem nor a link. This makes this item not able to link to anything."`,
@@ -82,7 +85,7 @@ describe('postProcess', () => {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
           version: {path: 'version'},
           drafts: [],
-        },
+        } as unknown as SidebarPostProcessorParams,
       ),
     ).toMatchSnapshot();
 
@@ -103,7 +106,7 @@ describe('postProcess', () => {
           sidebarOptions: {sidebarCollapsed: false, sidebarCollapsible: false},
           version: {path: 'version'},
           drafts: [],
-        },
+        } as unknown as SidebarPostProcessorParams,
       ),
     ).toMatchSnapshot();
 
@@ -123,7 +126,7 @@ describe('postProcess', () => {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: false},
           version: {path: 'version'},
           drafts: [],
-        },
+        } as unknown as SidebarPostProcessorParams,
       ),
     ).toMatchSnapshot();
   });
@@ -153,7 +156,7 @@ describe('postProcess', () => {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
           version: {path: 'version'},
           drafts: [{id: 'foo', unversionedId: 'foo'}],
-        },
+        } as unknown as SidebarPostProcessorParams,
       ),
     ).toMatchSnapshot();
   });
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts
index 7dc7111dbe0a..bb5eefda526f 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/processor.test.ts
@@ -12,7 +12,7 @@ import {DefaultSidebarItemsGenerator} from '../generator';
 import {DefaultNumberPrefixParser} from '../../numberPrefix';
 import {isCategoryIndex} from '../../docs';
 import type {
-  SidebarItem,
+  Sidebar,
   SidebarItemsGenerator,
   NormalizedSidebar,
   NormalizedSidebars,
@@ -24,12 +24,12 @@ import type {VersionMetadata} from '@docusaurus/plugin-content-docs';
 
 describe('processSidebars', () => {
   function createStaticSidebarItemGenerator(
-    sidebarSlice: SidebarItem[],
+    sidebarSlice: NormalizedSidebar,
   ): SidebarItemsGenerator {
     return jest.fn(() => sidebarSlice);
   }
 
-  const StaticGeneratedSidebarSlice: NormalizedSidebar = [
+  const StaticGeneratedSidebarSlice: Sidebar = [
     {type: 'doc', id: 'doc-generated-id-1'},
     {type: 'doc', id: 'doc-generated-id-2'},
   ];
@@ -215,7 +215,7 @@ describe('processSidebars', () => {
       },
     ];
 
-    const unprocessedSidebars = {
+    const unprocessedSidebars: NormalizedSidebars = {
       someSidebar: [{type: 'autogenerated', dirName: 'dir2'}],
     };
 
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
index 58c69912d704..d8399e502279 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
@@ -18,7 +18,7 @@ import type {
   SidebarItemCategoryLink,
 } from './types';
 
-type SidebarPostProcessorParams = SidebarProcessorParams & {
+export type SidebarPostProcessorParams = SidebarProcessorParams & {
   draftIds: Set<string>;
 };
 
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts b/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
index e48bc9302e49..7754ced825af 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
@@ -6,10 +6,20 @@
  */
 
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
-import {validateOptions, DEFAULT_OPTIONS, type Options} from '../options';
+import {
+  validateOptions,
+  DEFAULT_OPTIONS,
+  type Options,
+  type PluginOptions,
+} from '../options';
+import type {EnumChangefreq} from 'sitemap';
+import type {Validate} from '@docusaurus/types';
 
 function testValidate(options: Options) {
-  return validateOptions({validate: normalizePluginOptions, options});
+  return validateOptions({
+    validate: normalizePluginOptions as Validate<Options, PluginOptions>,
+    options,
+  });
 }
 
 const defaultOptions = {
@@ -24,7 +34,7 @@ describe('validateOptions', () => {
 
   it('accepts correctly defined user options', () => {
     const userOptions: Options = {
-      changefreq: 'yearly',
+      changefreq: 'yearly' as EnumChangefreq,
       priority: 0.9,
       ignorePatterns: ['/search/**'],
     };
@@ -44,7 +54,7 @@ describe('validateOptions', () => {
 
   it('rejects bad changefreq inputs', () => {
     expect(() =>
-      testValidate({changefreq: 'annually'}),
+      testValidate({changefreq: 'annually' as EnumChangefreq}),
     ).toThrowErrorMatchingInlineSnapshot(
       `""changefreq" must be one of [daily, monthly, always, hourly, weekly, yearly, never]"`,
     );
diff --git a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
index dd4eaae6df49..da76d5edd34e 100644
--- a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
+++ b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
@@ -501,7 +501,7 @@ describe('themeConfig', () => {
         links: [
           {
             title: null, // Default value is important to distinguish simple footer from multi-column footer
-            items: partialConfig.footer.links[0].items,
+            items: partialConfig.footer.links[0]!.items,
           },
         ],
       },
@@ -657,7 +657,7 @@ describe('themeConfig', () => {
   });
 
   describe('color mode config', () => {
-    const withDefaultValues = (colorMode: ThemeConfig['colorMode']) =>
+    const withDefaultValues = (colorMode?: ThemeConfig['colorMode']) =>
       _.merge({}, DEFAULT_CONFIG.colorMode, colorMode);
 
     it('switch config', () => {
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 76861545731f..bc9b9c9bbaf3 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -1032,10 +1032,10 @@ declare module '@theme/Tabs' {
     readonly lazy?: boolean;
     readonly block?: boolean;
     readonly children: readonly ReactElement<TabItemProps>[];
-    readonly defaultValue?: string | number | null;
+    readonly defaultValue?: string | null;
     readonly values?: readonly {
-      value: string | number;
-      label?: string | number;
+      value: string;
+      label?: string;
       attributes?: {[key: string]: unknown};
     }[];
     readonly groupId?: string;
diff --git a/packages/docusaurus-theme-classic/src/theme/Tabs/__tests__/index.test.tsx b/packages/docusaurus-theme-classic/src/theme/Tabs/__tests__/index.test.tsx
index f5d4f2d7f58f..79329bf518aa 100644
--- a/packages/docusaurus-theme-classic/src/theme/Tabs/__tests__/index.test.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Tabs/__tests__/index.test.tsx
@@ -117,9 +117,12 @@ describe('Tabs', () => {
         <ScrollControllerProvider>
           <TabGroupChoiceProvider>
             <Tabs
+              // @ts-expect-error: for an edge-case that we didn't write types for
               values={tabs.map((t, idx) => ({label: t, value: idx}))}
+              // @ts-expect-error: for an edge-case that we didn't write types for
               defaultValue={0}>
               {tabs.map((t, idx) => (
+                // @ts-expect-error: for an edge-case that we didn't write types for
                 <TabItem key={idx} value={idx}>
                   {t}
                 </TabItem>
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/generalUtils.test.tsx b/packages/docusaurus-theme-common/src/utils/__tests__/generalUtils.test.tsx
index 6a2680fde148..02c2ad551993 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/generalUtils.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/generalUtils.test.tsx
@@ -25,7 +25,7 @@ describe('useTitleFormatter', () => {
         title: 'my site',
         titleDelimiter: '·',
       },
-    });
+    } as DocusaurusContext);
     expect(mockUseTitleFormatter('a page')).toBe('a page · my site');
     expect(mockUseTitleFormatter(undefined)).toBe('my site');
     expect(mockUseTitleFormatter('    ')).toBe('my site');
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/useAlternatePageUtils.test.tsx b/packages/docusaurus-theme-common/src/utils/__tests__/useAlternatePageUtils.test.tsx
index e10b938baa4b..fb964b015fec 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/useAlternatePageUtils.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/useAlternatePageUtils.test.tsx
@@ -26,7 +26,7 @@ describe('useAlternatePageUtils', () => {
     const mockUseAlternatePageUtils = createUseAlternatePageUtilsMock({
       siteConfig: {baseUrl: '/', url: 'https://example.com'},
       i18n: {defaultLocale: 'en', currentLocale: 'en'},
-    });
+    } as DocusaurusContext);
     expect(
       mockUseAlternatePageUtils('/').createUrl({
         locale: 'zh-Hans',
@@ -51,7 +51,7 @@ describe('useAlternatePageUtils', () => {
     const mockUseAlternatePageUtils = createUseAlternatePageUtilsMock({
       siteConfig: {baseUrl: '/zh-Hans/', url: 'https://example.com'},
       i18n: {defaultLocale: 'en', currentLocale: 'zh-Hans'},
-    });
+    } as DocusaurusContext);
     expect(
       mockUseAlternatePageUtils('/zh-Hans/').createUrl({
         locale: 'en',
@@ -76,7 +76,7 @@ describe('useAlternatePageUtils', () => {
     const mockUseAlternatePageUtils = createUseAlternatePageUtilsMock({
       siteConfig: {baseUrl: '/base/', url: 'https://example.com'},
       i18n: {defaultLocale: 'en', currentLocale: 'en'},
-    });
+    } as DocusaurusContext);
     expect(
       mockUseAlternatePageUtils('/base/').createUrl({
         locale: 'zh-Hans',
@@ -101,7 +101,7 @@ describe('useAlternatePageUtils', () => {
     const mockUseAlternatePageUtils = createUseAlternatePageUtilsMock({
       siteConfig: {baseUrl: '/base/zh-Hans/', url: 'https://example.com'},
       i18n: {defaultLocale: 'en', currentLocale: 'zh-Hans'},
-    });
+    } as DocusaurusContext);
     expect(
       mockUseAlternatePageUtils('/base/zh-Hans/').createUrl({
         locale: 'en',
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/useLocalPathname.test.tsx b/packages/docusaurus-theme-common/src/utils/__tests__/useLocalPathname.test.tsx
index f2f6e189393a..d0b78511d00d 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/useLocalPathname.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/useLocalPathname.test.tsx
@@ -25,14 +25,14 @@ describe('useLocalPathname', () => {
   it('works for baseUrl: /', () => {
     const mockUseLocalPathname = createUseLocalPathnameMock({
       siteConfig: {baseUrl: '/'},
-    });
+    } as DocusaurusContext);
     expect(mockUseLocalPathname('/foo')).toBe('/foo');
   });
 
   it('works for non-root baseUrl', () => {
     const mockUseLocalPathname = createUseLocalPathnameMock({
       siteConfig: {baseUrl: '/base/'},
-    });
+    } as DocusaurusContext);
     expect(mockUseLocalPathname('/base/foo')).toBe('/foo');
   });
 });
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx b/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
index f789734119f7..81a251bb3c5e 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
@@ -40,7 +40,7 @@ describe('usePluralForm', () => {
       .mockImplementation(() => {});
     expect(mockUsePluralForm().selectMessage(1, 'one|many')).toBe('one');
     expect(mockUsePluralForm().selectMessage(10, 'one|many')).toBe('one');
-    expect(consoleMock.mock.calls[0][0]).toMatchInlineSnapshot(
+    expect(consoleMock.mock.calls[0]![0]).toMatchInlineSnapshot(
       `"For locale=zh-Hans, a maximum of 1 plural forms are expected (other), but the message contains 2: one|many"`,
     );
   });
@@ -65,10 +65,11 @@ describe('usePluralForm', () => {
       .mockImplementation(() => {});
     const pluralMock = jest
       .spyOn(Intl, 'PluralRules')
+      // @ts-expect-error: for testing when it doesn't exist
       .mockImplementation(() => undefined);
     expect(mockUsePluralForm().selectMessage(1, 'one|many')).toBe('one');
     expect(mockUsePluralForm().selectMessage(10, 'one|many')).toBe('many');
-    expect(consoleMock.mock.calls[0][0]).toMatchInlineSnapshot(`
+    expect(consoleMock.mock.calls[0]![0]).toMatchInlineSnapshot(`
       "Failed to use Intl.PluralRules for locale "zh-Hans".
       Docusaurus will fallback to the default (English) implementation.
       Error: pluralRules.resolvedOptions is not a function
diff --git a/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx b/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx
index 1f52a15b4070..e3f1c52abc31 100644
--- a/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx
+++ b/packages/docusaurus/src/client/exports/__tests__/useGlobalData.test.tsx
@@ -12,14 +12,16 @@ import useGlobalData, {
   usePluginData,
 } from '../useGlobalData';
 import {Context} from '../../docusaurusContext';
+import type {DocusaurusContext} from '@docusaurus/types';
 
 describe('useGlobalData', () => {
   it('returns global data from context', () => {
     expect(
       renderHook(() => useGlobalData(), {
         wrapper: ({children}) => (
-          // eslint-disable-next-line react/jsx-no-constructed-context-values
-          <Context.Provider value={{globalData: {foo: 'bar'}}}>
+          <Context.Provider
+            // eslint-disable-next-line react/jsx-no-constructed-context-values
+            value={{globalData: {foo: 'bar'}} as unknown as DocusaurusContext}>
             {children}
           </Context.Provider>
         ),
@@ -34,8 +36,12 @@ describe('useAllPluginInstancesData', () => {
       renderHook(() => useAllPluginInstancesData('foo'), {
         wrapper: ({children}) => (
           <Context.Provider
-            // eslint-disable-next-line react/jsx-no-constructed-context-values
-            value={{globalData: {foo: {default: 'default', bar: 'bar'}}}}>
+            value={
+              // eslint-disable-next-line react/jsx-no-constructed-context-values
+              {
+                globalData: {foo: {default: 'default', bar: 'bar'}},
+              } as unknown as DocusaurusContext
+            }>
             {children}
           </Context.Provider>
         ),
@@ -49,8 +55,12 @@ describe('useAllPluginInstancesData', () => {
         renderHook(() => useAllPluginInstancesData('bar', {failfast: true}), {
           wrapper: ({children}) => (
             <Context.Provider
-              // eslint-disable-next-line react/jsx-no-constructed-context-values
-              value={{globalData: {foo: {default: 'default', bar: 'bar'}}}}>
+              value={
+                // eslint-disable-next-line react/jsx-no-constructed-context-values
+                {
+                  globalData: {foo: {default: 'default', bar: 'bar'}},
+                } as unknown as DocusaurusContext
+              }>
               {children}
             </Context.Provider>
           ),
@@ -67,8 +77,12 @@ describe('usePluginData', () => {
       renderHook(() => usePluginData('foo', 'bar'), {
         wrapper: ({children}) => (
           <Context.Provider
-            // eslint-disable-next-line react/jsx-no-constructed-context-values
-            value={{globalData: {foo: {default: 'default', bar: 'bar'}}}}>
+            value={
+              // eslint-disable-next-line react/jsx-no-constructed-context-values
+              {
+                globalData: {foo: {default: 'default', bar: 'bar'}},
+              } as unknown as DocusaurusContext
+            }>
             {children}
           </Context.Provider>
         ),
@@ -81,8 +95,12 @@ describe('usePluginData', () => {
       renderHook(() => usePluginData('foo'), {
         wrapper: ({children}) => (
           <Context.Provider
-            // eslint-disable-next-line react/jsx-no-constructed-context-values
-            value={{globalData: {foo: {default: 'default', bar: 'bar'}}}}>
+            value={
+              // eslint-disable-next-line react/jsx-no-constructed-context-values
+              {
+                globalData: {foo: {default: 'default', bar: 'bar'}},
+              } as unknown as DocusaurusContext
+            }>
             {children}
           </Context.Provider>
         ),
@@ -96,8 +114,12 @@ describe('usePluginData', () => {
         renderHook(() => usePluginData('foo', 'baz', {failfast: true}), {
           wrapper: ({children}) => (
             <Context.Provider
-              // eslint-disable-next-line react/jsx-no-constructed-context-values
-              value={{globalData: {foo: {default: 'default', bar: 'bar'}}}}>
+              value={
+                // eslint-disable-next-line react/jsx-no-constructed-context-values
+                {
+                  globalData: {foo: {default: 'default', bar: 'bar'}},
+                } as unknown as DocusaurusContext
+              }>
               {children}
             </Context.Provider>
           ),
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts
index d73280553085..2bbfca6407ab 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts
@@ -126,7 +126,7 @@ describe('wrap', () => {
       siteDir,
       siteThemePath,
       createdFiles: stableCreatedFiles(siteThemePath, result.createdFiles),
-      firstFileContent: () => fs.readFile(result.createdFiles[0], 'utf8'),
+      firstFileContent: () => fs.readFile(result.createdFiles[0]!, 'utf8'),
       tree: tree(siteThemePath),
     };
   }
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
index c2317cb41c22..74e94678f3c2 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
@@ -55,13 +55,13 @@ class MockExitError extends Error {
 }
 
 function createExitMock() {
-  let mock: jest.SpyInstance;
+  let mock: jest.SpyInstance<(code?: number) => never>;
 
   // eslint-disable-next-line jest/require-top-level-describe
   beforeEach(async () => {
     mock = jest.spyOn(process, 'exit').mockImplementation((code) => {
-      throw new MockExitError(code);
-    });
+      throw new MockExitError(code!);
+    }) as jest.SpyInstance<(code?: number) => never>;
   });
   // eslint-disable-next-line jest/require-top-level-describe
   afterEach(async () => {
diff --git a/packages/docusaurus/src/server/__tests__/clientModules.test.ts b/packages/docusaurus/src/server/__tests__/clientModules.test.ts
index c27ba51c1900..5e22efd63057 100644
--- a/packages/docusaurus/src/server/__tests__/clientModules.test.ts
+++ b/packages/docusaurus/src/server/__tests__/clientModules.test.ts
@@ -8,20 +8,20 @@
 import {loadClientModules} from '../clientModules';
 import type {LoadedPlugin} from '@docusaurus/types';
 
-const pluginEmpty: LoadedPlugin = {
+const pluginEmpty = {
   name: 'plugin-empty',
   path: __dirname,
-};
+} as LoadedPlugin;
 
-const pluginFooBar: LoadedPlugin = {
+const pluginFooBar = {
   name: 'plugin-foo-bar',
   path: __dirname,
   getClientModules() {
     return ['foo', 'bar'];
   },
-};
+} as LoadedPlugin;
 
-const pluginHelloWorld: LoadedPlugin = {
+const pluginHelloWorld = {
   plugin: 'plugin-hello-world',
   path: __dirname,
   getClientModules() {
@@ -31,7 +31,7 @@ const pluginHelloWorld: LoadedPlugin = {
       'world',
     ];
   },
-};
+} as unknown as LoadedPlugin;
 
 describe('loadClientModules', () => {
   it('loads an empty plugin', () => {
diff --git a/packages/docusaurus/src/server/__tests__/configValidation.test.ts b/packages/docusaurus/src/server/__tests__/configValidation.test.ts
index 70eaa3900e3c..bd42f1f96569 100644
--- a/packages/docusaurus/src/server/__tests__/configValidation.test.ts
+++ b/packages/docusaurus/src/server/__tests__/configValidation.test.ts
@@ -10,15 +10,16 @@ import {
   DEFAULT_CONFIG,
   validateConfig,
 } from '../configValidation';
-import type {DocusaurusConfig} from '@docusaurus/types';
+import type {Config} from '@docusaurus/types';
 
-const baseConfig: DocusaurusConfig = {
+const baseConfig = {
   baseUrl: '/',
   title: 'my site',
   url: 'https://mysite.com',
-};
+} as Config;
 
-const normalizeConfig = (config) => validateConfig({...baseConfig, ...config});
+const normalizeConfig = (config: Partial<Config>) =>
+  validateConfig({...baseConfig, ...config});
 
 describe('normalizeConfig', () => {
   it('normalizes empty config', () => {
@@ -79,6 +80,7 @@ describe('normalizeConfig', () => {
   it('throws error for unknown field', () => {
     expect(() => {
       normalizeConfig({
+        // @ts-expect-error: test
         invalid: true,
       });
     }).toThrowErrorMatchingSnapshot();
@@ -113,6 +115,7 @@ describe('normalizeConfig', () => {
   ])(`%s for the input of: %p`, (_message, plugins) => {
     expect(() => {
       normalizeConfig({
+        // @ts-expect-error: test
         plugins,
       });
     }).toThrowErrorMatchingSnapshot();
@@ -139,6 +142,7 @@ describe('normalizeConfig', () => {
   ])(`%s for the input of: %p`, (_message, themes) => {
     expect(() => {
       normalizeConfig({
+        // @ts-expect-error: test
         themes,
       });
     }).toThrowErrorMatchingSnapshot();
@@ -174,12 +178,12 @@ describe('normalizeConfig', () => {
       'should accept [function, object] for plugin',
       [[() => {}, {it: 'should work'}]],
     ],
-    ['should accept false/null for plugin', [false, null, 'classic']],
+    ['should accept false/null for plugin', [false as const, null, 'classic']],
   ])(`%s for the input of: %p`, (_message, plugins) => {
     expect(() => {
       normalizeConfig({
         plugins,
-      });
+      } as Config);
     }).not.toThrowError();
   });
 
@@ -218,13 +222,14 @@ describe('normalizeConfig', () => {
     expect(() => {
       normalizeConfig({
         themes,
-      });
+      } as Config);
     }).not.toThrowError();
   });
 
   it('throws error if themes is not array', () => {
     expect(() => {
       normalizeConfig({
+        // @ts-expect-error: test
         themes: {},
       });
     }).toThrowErrorMatchingInlineSnapshot(`
@@ -236,6 +241,7 @@ describe('normalizeConfig', () => {
   it('throws error if presets is not array', () => {
     expect(() => {
       normalizeConfig({
+        // @ts-expect-error: test
         presets: {},
       });
     }).toThrowErrorMatchingInlineSnapshot(`
@@ -247,6 +253,7 @@ describe('normalizeConfig', () => {
   it('throws error if presets looks invalid', () => {
     expect(() => {
       normalizeConfig({
+        // @ts-expect-error: test
         presets: [() => {}],
       });
     }).toThrowErrorMatchingInlineSnapshot(`
@@ -314,10 +321,10 @@ describe('config warnings', () => {
     const warning = getWarning({
       ...baseConfig,
       url: 'https://mysite.com/someSubpath',
-    });
+    })!;
     expect(warning).toBeDefined();
     expect(warning.details).toHaveLength(1);
-    expect(warning.details[0].message).toMatchInlineSnapshot(
+    expect(warning.details[0]!.message).toMatchInlineSnapshot(
       `"Docusaurus config validation warning. Field "url": the url is not supposed to contain a sub-path like '/someSubpath', please use the baseUrl field for sub-paths"`,
     );
   });
diff --git a/packages/docusaurus/src/server/__tests__/htmlTags.test.ts b/packages/docusaurus/src/server/__tests__/htmlTags.test.ts
index d701d23f1b57..ba2f82fdc39a 100644
--- a/packages/docusaurus/src/server/__tests__/htmlTags.test.ts
+++ b/packages/docusaurus/src/server/__tests__/htmlTags.test.ts
@@ -8,11 +8,11 @@
 import {loadHtmlTags} from '../htmlTags';
 import type {LoadedPlugin} from '@docusaurus/types';
 
-const pluginEmpty: LoadedPlugin = {
+const pluginEmpty = {
   name: 'plugin-empty',
-};
+} as LoadedPlugin;
 
-const pluginPreBodyTags: LoadedPlugin = {
+const pluginPreBodyTags = {
   name: 'plugin-preBodyTags',
   injectHtmlTags() {
     return {
@@ -26,9 +26,9 @@ const pluginPreBodyTags: LoadedPlugin = {
       },
     };
   },
-};
+} as unknown as LoadedPlugin;
 
-const pluginHeadTags: LoadedPlugin = {
+const pluginHeadTags = {
   name: 'plugin-headTags-only',
   injectHtmlTags() {
     return {
@@ -59,9 +59,9 @@ const pluginHeadTags: LoadedPlugin = {
       ],
     };
   },
-};
+} as unknown as LoadedPlugin;
 
-const pluginPostBodyTags: LoadedPlugin = {
+const pluginPostBodyTags = {
   name: 'plugin-postBody-tags',
   injectHtmlTags() {
     return {
@@ -74,14 +74,14 @@ const pluginPostBodyTags: LoadedPlugin = {
       ],
     };
   },
-};
+} as unknown as LoadedPlugin;
 
-const pluginMaybeInjectHeadTags: LoadedPlugin = {
+const pluginMaybeInjectHeadTags = {
   name: 'plugin-postBody-tags',
   injectHtmlTags() {
     return undefined;
   },
-};
+} as unknown as LoadedPlugin;
 
 describe('loadHtmlTags', () => {
   it('works for an empty plugin', () => {
@@ -170,6 +170,7 @@ describe('loadHtmlTags', () => {
   it('throws for invalid tag', () => {
     expect(() =>
       loadHtmlTags([
+        // @ts-expect-error: test
         {
           injectHtmlTags() {
             return {
@@ -192,6 +193,7 @@ describe('loadHtmlTags', () => {
     expect(() =>
       loadHtmlTags([
         {
+          // @ts-expect-error: test
           injectHtmlTags() {
             return {
               headTags: {
@@ -210,6 +212,7 @@ describe('loadHtmlTags', () => {
     expect(() =>
       loadHtmlTags([
         {
+          // @ts-expect-error: test
           injectHtmlTags() {
             return {
               headTags: 2,
diff --git a/packages/docusaurus/src/server/__tests__/i18n.test.ts b/packages/docusaurus/src/server/__tests__/i18n.test.ts
index 5142d0972fbb..84e1e83ada2d 100644
--- a/packages/docusaurus/src/server/__tests__/i18n.test.ts
+++ b/packages/docusaurus/src/server/__tests__/i18n.test.ts
@@ -180,7 +180,7 @@ describe('loadI18n', () => {
       },
       'it',
     );
-    expect(consoleSpy.mock.calls[0][0]).toMatch(
+    expect(consoleSpy.mock.calls[0]![0]).toMatch(
       /The locale .*it.* was not found in your site configuration/,
     );
   });
diff --git a/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts b/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts
index 30a40bb7521d..3985173a03b8 100644
--- a/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts
+++ b/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts
@@ -8,6 +8,7 @@
 import {jest} from '@jest/globals';
 import path from 'path';
 import {getPluginVersion, loadSiteMetadata} from '../siteMetadata';
+import type {LoadedPlugin} from '@docusaurus/types';
 
 describe('getPluginVersion', () => {
   it('detects external packages plugins versions', async () => {
@@ -51,11 +52,11 @@ describe('loadSiteMetadata', () => {
               name: '@docusaurus/plugin-content-docs',
             },
           },
-        ],
+        ] as LoadedPlugin[],
         siteDir: path.join(__dirname, '__fixtures__/siteMetadata'),
       }),
     ).resolves.toMatchSnapshot();
-    expect(consoleMock.mock.calls[0][0]).toMatchInlineSnapshot(`
+    expect(consoleMock.mock.calls[0]![0]).toMatchInlineSnapshot(`
       "[ERROR] Invalid docusaurus-plugin-content-docs version 1.0.0.
       All official @docusaurus/* packages should have the exact same version as @docusaurus/core (<CURRENT_VERSION>).
       Maybe you want to check, or regenerate your yarn.lock or package-lock.json file?"
diff --git a/packages/docusaurus/src/server/__tests__/utils.test.ts b/packages/docusaurus/src/server/__tests__/utils.test.ts
index 646657350522..a93adea41f69 100644
--- a/packages/docusaurus/src/server/__tests__/utils.test.ts
+++ b/packages/docusaurus/src/server/__tests__/utils.test.ts
@@ -25,8 +25,8 @@ describe('getAllFinalRoutes', () => {
       },
     ];
     expect(getAllFinalRoutes(routes)).toEqual([
-      routes[0].routes[0],
-      routes[0].routes[1],
+      routes[0]!.routes![0],
+      routes[0]!.routes![1],
       routes[1],
     ]);
   });
diff --git a/packages/docusaurus/src/server/plugins/__tests__/index.test.ts b/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
index 148e20fa46a6..2d85798e3633 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/index.test.ts
@@ -7,7 +7,7 @@
 
 import path from 'path';
 import {loadPlugins} from '..';
-import type {Props} from '@docusaurus/types';
+import type {Plugin, Props} from '@docusaurus/types';
 
 describe('loadPlugins', () => {
   it('loads plugins', async () => {
@@ -23,23 +23,24 @@ describe('loadPlugins', () => {
           themeConfig: {},
           presets: [],
           plugins: [
-            () => ({
-              name: 'test1',
-              prop: 'a',
-              async loadContent() {
-                // Testing that plugin lifecycle is bound to the plugin instance
-                return this.prop;
-              },
-              async contentLoaded({content, actions}) {
-                actions.addRoute({
-                  path: 'foo',
-                  component: 'Comp',
-                  modules: {content: 'path'},
-                  context: {content: 'path'},
-                });
-                actions.setGlobalData({content, prop: this.prop});
-              },
-            }),
+            () =>
+              ({
+                name: 'test1',
+                prop: 'a',
+                async loadContent() {
+                  // Testing that plugin lifecycle is bound to the plugin instance
+                  return this.prop;
+                },
+                async contentLoaded({content, actions}) {
+                  actions.addRoute({
+                    path: 'foo',
+                    component: 'Comp',
+                    modules: {content: 'path'},
+                    context: {content: 'path'},
+                  });
+                  actions.setGlobalData({content, prop: this.prop});
+                },
+              } as Plugin & ThisType<{prop: 'a'}>),
           ],
           themes: [
             () => ({
diff --git a/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts b/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts
index c91709df62df..6cff740b08b0 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/presets.test.ts
@@ -6,7 +6,6 @@
  */
 
 import path from 'path';
-
 import {loadPresets} from '../presets';
 import type {LoadContext} from '@docusaurus/types';
 
@@ -17,7 +16,7 @@ describe('loadPresets', () => {
       siteConfig: {
         presets: [],
       },
-    } as LoadContext;
+    } as unknown as LoadContext;
     const presets = await loadPresets(context);
     expect(presets).toMatchInlineSnapshot(`
       {
diff --git a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
index 7ced1c70b5c2..70da33ffd3eb 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
@@ -292,13 +292,12 @@ describe('writePluginTranslations', () => {
           key3: {message: 'key3 message'},
         },
       },
-      // @ts-expect-error: enough for this test
       plugin: {
         name: 'my-plugin-name',
         options: {
-          id: undefined,
+          id: 'default',
         },
-      },
+      } as LoadedPlugin,
     });
 
     await expect(fs.readJSON(filePath)).resolves.toEqual({
@@ -698,7 +697,7 @@ describe('applyDefaultCodeTranslations', () => {
       },
     });
     expect(consoleWarnMock).toHaveBeenCalledTimes(1);
-    expect(consoleWarnMock.mock.calls[0][0]).toMatch(/unknownId/);
+    expect(consoleWarnMock.mock.calls[0]![0]).toMatch(/unknownId/);
   });
 
   it('works for realistic scenario', () => {
@@ -740,7 +739,7 @@ describe('applyDefaultCodeTranslations', () => {
       },
     });
     expect(consoleWarnMock).toHaveBeenCalledTimes(1);
-    expect(consoleWarnMock.mock.calls[0][0]).toMatch(/idUnknown1/);
-    expect(consoleWarnMock.mock.calls[0][0]).toMatch(/idUnknown2/);
+    expect(consoleWarnMock.mock.calls[0]![0]).toMatch(/idUnknown1/);
+    expect(consoleWarnMock.mock.calls[0]![0]).toMatch(/idUnknown2/);
   });
 });
diff --git a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
index ac74f839ea2e..f1fa317671ba 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
@@ -721,7 +721,7 @@ export default function MyComponent(props: Props) {
         message: 'plugin2 message 2',
       },
     });
-    expect(consoleWarnMock.mock.calls[0][0]).toMatch(
+    expect(consoleWarnMock.mock.calls[0]![0]).toMatch(
       /.*\[WARNING\].* Translation extraction warnings for file .*src.theme.file4\.jsx.*\n.*- translate\(\) first arg should be a statically evaluable object\./,
     );
   });
diff --git a/packages/docusaurus/src/webpack/__tests__/utils.test.ts b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
index f5366ded41c1..d8c84cacc3a3 100644
--- a/packages/docusaurus/src/webpack/__tests__/utils.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
@@ -61,7 +61,7 @@ describe('extending generated webpack config', () => {
     };
 
     // @ts-expect-error: Testing an edge-case that we did not write types for
-    const configureWebpack: Plugin['configureWebpack'] = (
+    const configureWebpack: NonNullable<Plugin['configureWebpack']> = (
       generatedConfig,
       isServer,
     ) => {
@@ -129,7 +129,7 @@ describe('extending generated webpack config', () => {
     const createConfigureWebpack =
       (mergeStrategy?: {
         [key: string]: 'prepend' | 'append';
-      }): Plugin['configureWebpack'] =>
+      }): NonNullable<Plugin['configureWebpack']> =>
       () => ({
         module: {
           rules: [{use: 'zzz'}],
@@ -272,7 +272,7 @@ describe('extending PostCSS', () => {
     expect(postCssLoader1.loader).toBe('postcss-loader-1');
 
     const pluginNames1 = postCssLoader1.options.postcssOptions.plugins.map(
-      (p: unknown) => p[0],
+      (p: unknown[]) => p[0],
     );
     expect(pluginNames1).toHaveLength(4);
     expect(pluginNames1).toEqual([
@@ -287,7 +287,7 @@ describe('extending PostCSS', () => {
     expect(postCssLoader2.loader).toBe('postcss-loader-2');
 
     const pluginNames2 = postCssLoader2.options.postcssOptions.plugins.map(
-      (p: unknown) => p[0],
+      (p: unknown[]) => p[0],
     );
     expect(pluginNames2).toHaveLength(4);
     expect(pluginNames2).toEqual([
diff --git a/packages/docusaurus/src/webpack/aliases/__tests__/index.test.ts b/packages/docusaurus/src/webpack/aliases/__tests__/index.test.ts
index b2154a41f5db..ae831259198f 100644
--- a/packages/docusaurus/src/webpack/aliases/__tests__/index.test.ts
+++ b/packages/docusaurus/src/webpack/aliases/__tests__/index.test.ts
@@ -13,6 +13,7 @@ import {
   sortAliases,
   createAliasesForTheme,
 } from '../index';
+import type {LoadedPlugin} from '@docusaurus/types';
 
 describe('sortAliases', () => {
   // https://github.com/facebook/docusaurus/issues/6878
@@ -197,7 +198,7 @@ describe('loadThemeAliases', () => {
       plugins: [
         {getThemePath: () => theme1Path},
         {getThemePath: () => theme2Path},
-      ],
+      ] as LoadedPlugin[],
     });
 
     // Testing entries, because order matters!

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 07/43] 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 08/43] 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 09/43] 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 10/43] 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 11/43] 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 12/43] 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 13/43] 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 14/43] 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 15/43] 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 16/43] 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 17/43] 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 18/43] 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 19/43] 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
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

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 20/43] 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 21/43] 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 22/43] 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!

From 1a5e33c71715070367dd57d37deae6bd99b5a46b Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Fri, 27 May 2022 20:32:22 +0800
Subject: [PATCH 23/43] refactor(pwa): remove reloadPopup option in favor of
 swizzling (#7422)

* refactor(pwa): remove reloadPopup option in favor of swizzling

* restore code splitting

* add deprecation
---
 packages/docusaurus-plugin-pwa/src/index.ts   |  2 --
 packages/docusaurus-plugin-pwa/src/options.ts |  9 +++---
 .../docusaurus-plugin-pwa/src/plugin-pwa.d.ts | 10 ------
 .../docusaurus-plugin-pwa/src/registerSw.ts   |  3 +-
 .../src/renderReloadPopup.tsx                 |  7 ++---
 website/docs/api/plugins/plugin-pwa.md        | 31 ++++++-------------
 6 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/packages/docusaurus-plugin-pwa/src/index.ts b/packages/docusaurus-plugin-pwa/src/index.ts
index 448e7d2f9917..895dc56f4013 100644
--- a/packages/docusaurus-plugin-pwa/src/index.ts
+++ b/packages/docusaurus-plugin-pwa/src/index.ts
@@ -52,7 +52,6 @@ export default function pluginPWA(
     debug,
     offlineModeActivationStrategies,
     injectManifestConfig,
-    reloadPopup,
     pwaHead,
     swCustom,
     swRegister,
@@ -94,7 +93,6 @@ export default function pluginPWA(
             ),
             PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES:
               offlineModeActivationStrategies,
-            PWA_RELOAD_POPUP: reloadPopup,
           }),
         ],
       };
diff --git a/packages/docusaurus-plugin-pwa/src/options.ts b/packages/docusaurus-plugin-pwa/src/options.ts
index 8517028f9f20..0332a26707a6 100644
--- a/packages/docusaurus-plugin-pwa/src/options.ts
+++ b/packages/docusaurus-plugin-pwa/src/options.ts
@@ -20,7 +20,6 @@ const DEFAULT_OPTIONS = {
   pwaHead: [],
   swCustom: undefined,
   swRegister: './registerSw.js',
-  reloadPopup: '@theme/PwaReloadPopup',
 };
 
 const optionsSchema = Joi.object<PluginOptions>({
@@ -49,9 +48,11 @@ const optionsSchema = Joi.object<PluginOptions>({
   swRegister: Joi.alternatives()
     .try(Joi.string(), Joi.bool().valid(false))
     .default(DEFAULT_OPTIONS.swRegister),
-  reloadPopup: Joi.alternatives()
-    .try(Joi.string(), Joi.bool().valid(false))
-    .default(DEFAULT_OPTIONS.reloadPopup),
+  // @ts-expect-error: forbidden
+  reloadPopup: Joi.any().forbidden().messages({
+    'any.unknown':
+      'The reloadPopup option is removed in favor of swizzling. See https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-pwa#customizing-reload-popup for how to customize the reload popup using swizzling.',
+  }),
 });
 
 export function validateOptions({
diff --git a/packages/docusaurus-plugin-pwa/src/plugin-pwa.d.ts b/packages/docusaurus-plugin-pwa/src/plugin-pwa.d.ts
index 9633e9e4e43a..85d6aa088441 100644
--- a/packages/docusaurus-plugin-pwa/src/plugin-pwa.d.ts
+++ b/packages/docusaurus-plugin-pwa/src/plugin-pwa.d.ts
@@ -46,16 +46,6 @@ declare module '@docusaurus/plugin-pwa' {
      * @see https://developers.google.com/web/tools/workbox/reference-docs/latest/module-workbox-build#.injectManifest
      */
     injectManifestConfig: InjectManifestOptions;
-    /**
-     * Module path to reload popup component. This popup is rendered when a new
-     * service worker is waiting to be installed, and we suggest a reload to
-     * the user.
-     *
-     * Passing `false` will disable the popup, but this is not recommended:
-     * users won't have a way to get up-to-date content.
-     * @see {@link @theme/PwaReloadPopup}
-     */
-    reloadPopup: string | false;
     /**
      * Array of objects containing `tagName` and key-value pairs for attributes
      * to inject into the `<head>` tag. Technically you can inject any head tag
diff --git a/packages/docusaurus-plugin-pwa/src/registerSw.ts b/packages/docusaurus-plugin-pwa/src/registerSw.ts
index d48e7b29b2f7..7ccb4a56a233 100644
--- a/packages/docusaurus-plugin-pwa/src/registerSw.ts
+++ b/packages/docusaurus-plugin-pwa/src/registerSw.ts
@@ -10,7 +10,6 @@ import {createStorageSlot} from '@docusaurus/theme-common';
 // First: read the env variables (provided by Webpack)
 /* eslint-disable prefer-destructuring */
 const PWA_SERVICE_WORKER_URL = process.env.PWA_SERVICE_WORKER_URL!;
-const PWA_RELOAD_POPUP = process.env.PWA_RELOAD_POPUP;
 const PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES = process.env
   .PWA_OFFLINE_MODE_ACTIVATION_STRATEGIES as unknown as (keyof typeof OfflineModeActivationStrategiesImplementations)[];
 const PWA_DEBUG = process.env.PWA_DEBUG;
@@ -170,7 +169,7 @@ async function registerSW() {
     // Immediately load new service worker when files aren't cached
     if (!offlineMode) {
       sendSkipWaiting();
-    } else if (PWA_RELOAD_POPUP) {
+    } else {
       const renderReloadPopup = (await import('./renderReloadPopup')).default;
       await renderReloadPopup({
         onReload() {
diff --git a/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx b/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx
index d4cac3601736..fe8e9eb2b0cd 100644
--- a/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx
+++ b/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import type {Props} from '@theme/PwaReloadPopup';
 
 const POPUP_CONTAINER_ID = 'pwa-popup-container';
 
@@ -19,10 +20,8 @@ const createContainer = () => {
   return container;
 };
 
-export default async function renderReloadPopup(props: {
-  onReload: () => void;
-}): Promise<void> {
+export default async function renderReloadPopup(props: Props): Promise<void> {
   const container = getContainer() || createContainer();
-  const {default: ReloadPopup} = await import(process.env.PWA_RELOAD_POPUP!);
+  const ReloadPopup = (await import('@theme/PwaReloadPopup')).default;
   ReactDOM.render(<ReloadPopup {...props} />, container);
 }
diff --git a/website/docs/api/plugins/plugin-pwa.md b/website/docs/api/plugins/plugin-pwa.md
index 7dc019fe97fb..a732e8094d68 100644
--- a/website/docs/api/plugins/plugin-pwa.md
+++ b/website/docs/api/plugins/plugin-pwa.md
@@ -171,27 +171,6 @@ module.exports = {
 };
 ```
 
-### `reloadPopup` {#reloadpopup}
-
-- Type: `string | false`
-- Default: `'@theme/PwaReloadPopup'`
-
-Module path to reload popup component. This popup is rendered when a new service worker is waiting to be installed, and we suggest a reload to the user.
-
-Passing `false` will disable the popup, but this is not recommended: users won't have a way to get up-to-date content.
-
-A custom component can be used, as long as it accepts `onReload` as a prop. The `onReload` callback should be called when the `reload` button is clicked. This will tell the service worker to install the waiting service worker and reload the page.
-
-```ts
-interface PwaReloadPopupProps {
-  onReload: () => void;
-}
-```
-
-The default theme includes an implementation for the reload popup and uses [Infima Alerts](https://infima.dev/docs/components/alert).
-
-![pwa_reload.gif](/img/pwa_reload.gif)
-
 ### `pwaHead` {#pwahead}
 
 - Type: `({ tagName: string; [attributeName: string]: string })[]`
@@ -312,3 +291,13 @@ import CodeBlock from '@theme/CodeBlock';
   {JSON.stringify(require("@site/static/manifest.json"),null,2)}
 </CodeBlock>
 ```
+
+## Customizing reload popup {#customizing-reload-popup}
+
+The `@theme/PwaReloadPopup` component is rendered when a new service worker is waiting to be installed, and we suggest a reload to the user. You can [swizzle](../../swizzling.md) this component and implement your own UI. It will receive an `onReload` callback as props, which should be called when the `reload` button is clicked. This will tell the service worker to install the waiting service worker and reload the page.
+
+The default theme includes an implementation for the reload popup and uses [Infima Alerts](https://infima.dev/docs/components/alert).
+
+![pwa_reload.gif](/img/pwa_reload.gif)
+
+Your component can render `null`, but this is not recommended: users won't have a way to get up-to-date content.

From 9398bb2487548bb28f761148332dcc64e943105e Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Fri, 27 May 2022 20:50:54 +0800
Subject: [PATCH 24/43] chore: upgrade dependencies (#7463)

* chore: upgrade a few loaders, require Node 14.15

* upgrade

* upgrade BPDIN
---
 package.json                                  |   15 +-
 .../templates/facebook/package.json           |    4 +-
 packages/docusaurus-mdx-loader/package.json   |    4 +-
 packages/docusaurus-migrate/package.json      |    3 +-
 .../package.json                              |    2 +-
 packages/docusaurus-plugin-pwa/package.json   |    6 +-
 packages/docusaurus-utils/package.json        |    2 +-
 packages/docusaurus/package.json              |   28 +-
 packages/eslint-plugin/package.json           |    2 +-
 packages/lqip-loader/package.json             |    2 +-
 packages/stylelint-copyright/package.json     |    2 +-
 website/package.json                          |    7 +-
 yarn.lock                                     | 2471 +++++++++--------
 13 files changed, 1286 insertions(+), 1262 deletions(-)

diff --git a/package.json b/package.json
index 533f32b71f48..1d449484aa38 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
   },
   "devDependencies": {
     "@crowdin/cli": "^3.7.8",
-    "@swc/core": "^1.2.189",
+    "@swc/core": "^1.2.194",
     "@swc/jest": "^0.2.21",
     "@testing-library/react-hooks": "^8.0.0",
     "@types/fs-extra": "^9.0.13",
@@ -76,8 +76,8 @@
     "@types/react-test-renderer": "^18.0.0",
     "@types/semver": "^7.3.9",
     "@types/shelljs": "^0.8.11",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
+    "@typescript-eslint/eslint-plugin": "^5.26.0",
+    "@typescript-eslint/parser": "^5.26.0",
     "cross-env": "^7.0.3",
     "cspell": "^6.0.0",
     "eslint": "^8.16.0",
@@ -95,21 +95,22 @@
     "jest": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
     "jest-serializer-react-helmet-async": "^1.0.21",
-    "lerna": "^4.0.0",
+    "lerna": "^5.0.0",
     "lerna-changelog": "^2.2.0",
-    "lint-staged": "^12.4.1",
+    "lint-staged": "^12.4.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-helmet-async": "^1.3.0",
     "react-test-renderer": "^17.0.2",
     "remark-parse": "^8.0.2",
     "rimraf": "^3.0.2",
-    "sharp": "^0.30.4",
+    "sharp": "^0.30.5",
     "strip-ansi": "^6.0.1",
     "stylelint": "^14.8.3",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^25.0.0",
-    "typescript": "^4.6.4"
+    "typescript": "~4.6.4"
   }
 }
diff --git a/packages/create-docusaurus/templates/facebook/package.json b/packages/create-docusaurus/templates/facebook/package.json
index 63b947a05071..7f1d5ed537d1 100644
--- a/packages/create-docusaurus/templates/facebook/package.json
+++ b/packages/create-docusaurus/templates/facebook/package.json
@@ -26,7 +26,7 @@
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@babel/eslint-parser": "^7.17.0",
+    "@babel/eslint-parser": "^7.18.2",
     "eslint": "^8.16.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.5.0",
@@ -36,7 +36,7 @@
     "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^4.5.0",
     "prettier": "^2.6.2",
-    "stylelint": "^14.8.3"
+    "stylelint": "^14.8.5"
   },
   "browserslist": {
     "production": [
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
index 36e190295f02..f0faef6e5ffb 100644
--- a/packages/docusaurus-mdx-loader/package.json
+++ b/packages/docusaurus-mdx-loader/package.json
@@ -18,8 +18,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/parser": "^7.18.0",
-    "@babel/traverse": "^7.18.0",
+    "@babel/parser": "^7.18.3",
+    "@babel/traverse": "^7.18.2",
     "@docusaurus/logger": "2.0.0-beta.20",
     "@docusaurus/utils": "2.0.0-beta.20",
     "@mdx-js/mdx": "^1.6.22",
diff --git a/packages/docusaurus-migrate/package.json b/packages/docusaurus-migrate/package.json
index 2102cac885c8..e7517316e6f0 100644
--- a/packages/docusaurus-migrate/package.json
+++ b/packages/docusaurus-migrate/package.json
@@ -22,7 +22,8 @@
     "docusaurus-migrate": "bin/index.mjs"
   },
   "dependencies": {
-    "@babel/preset-env": "^7.18.0",
+    "@babel/core": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
     "@docusaurus/logger": "2.0.0-beta.20",
     "@docusaurus/utils": "2.0.0-beta.20",
     "@mapbox/hast-util-to-jsx": "^2.0.0",
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index 582127cb4bc9..87f220d1521e 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -27,7 +27,7 @@
     "@docusaurus/utils-validation": "2.0.0-beta.20",
     "@endiliey/react-ideal-image": "^0.0.11",
     "react-waypoint": "^10.1.0",
-    "sharp": "^0.30.4",
+    "sharp": "^0.30.5",
     "tslib": "^2.4.0",
     "webpack": "^5.72.1"
   },
diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json
index 429ae3f1b186..9aaa0acdfbea 100644
--- a/packages/docusaurus-plugin-pwa/package.json
+++ b/packages/docusaurus-plugin-pwa/package.json
@@ -20,8 +20,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/core": "^7.18.0",
-    "@babel/preset-env": "^7.18.0",
+    "@babel/core": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
     "@docusaurus/core": "2.0.0-beta.20",
     "@docusaurus/theme-common": "2.0.0-beta.20",
     "@docusaurus/theme-translations": "2.0.0-beta.20",
@@ -29,7 +29,7 @@
     "@docusaurus/utils-validation": "2.0.0-beta.20",
     "babel-loader": "^8.2.5",
     "clsx": "^1.1.1",
-    "core-js": "^3.22.5",
+    "core-js": "^3.22.7",
     "terser-webpack-plugin": "^5.3.1",
     "tslib": "^2.4.0",
     "webpack": "^5.72.1",
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index 4a460a57d648..419580ce523f 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -42,7 +42,7 @@
     "@types/dedent": "^0.7.0",
     "@types/github-slugger": "^1.3.0",
     "@types/micromatch": "^4.0.2",
-    "@types/react-dom": "^18.0.4",
+    "@types/react-dom": "^18.0.5",
     "dedent": "^0.7.0"
   }
 }
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index 664fd9977dbd..a5d9f7a6e23c 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -33,16 +33,16 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@babel/core": "^7.18.0",
-    "@babel/generator": "^7.18.0",
+    "@babel/core": "^7.18.2",
+    "@babel/generator": "^7.18.2",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.18.0",
-    "@babel/preset-env": "^7.18.0",
+    "@babel/plugin-transform-runtime": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
     "@babel/preset-react": "^7.17.12",
     "@babel/preset-typescript": "^7.17.12",
-    "@babel/runtime": "^7.18.0",
-    "@babel/runtime-corejs3": "^7.18.0",
-    "@babel/traverse": "^7.18.0",
+    "@babel/runtime": "^7.18.3",
+    "@babel/runtime-corejs3": "^7.18.3",
+    "@babel/traverse": "^7.18.2",
     "@docusaurus/cssnano-preset": "2.0.0-beta.20",
     "@docusaurus/logger": "2.0.0-beta.20",
     "@docusaurus/mdx-loader": "2.0.0-beta.20",
@@ -54,7 +54,7 @@
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
-    "babel-plugin-dynamic-import-node": "2.3.0",
+    "babel-plugin-dynamic-import-node": "^2.3.3",
     "boxen": "^6.2.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -62,12 +62,12 @@
     "cli-table3": "^0.6.2",
     "combine-promises": "^1.1.0",
     "commander": "^5.1.0",
-    "copy-webpack-plugin": "^10.2.4",
-    "core-js": "^3.22.5",
+    "copy-webpack-plugin": "^11.0.0",
+    "core-js": "^3.22.7",
     "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^3.4.1",
+    "css-minimizer-webpack-plugin": "^4.0.0",
     "cssnano": "^5.1.9",
-    "del": "^6.1.0",
+    "del": "^6.1.1",
     "detect-port": "^1.3.0",
     "escape-html": "^1.0.3",
     "eta": "^1.12.3",
@@ -81,7 +81,7 @@
     "lodash": "^4.17.21",
     "mini-css-extract-plugin": "^2.6.0",
     "postcss": "^8.4.14",
-    "postcss-loader": "^6.2.1",
+    "postcss-loader": "^7.0.0",
     "prompts": "^2.4.2",
     "react-dev-utils": "^12.0.1",
     "react-helmet-async": "^1.3.0",
@@ -110,7 +110,7 @@
     "@docusaurus/module-type-aliases": "2.0.0-beta.20",
     "@docusaurus/types": "2.0.0-beta.20",
     "@types/detect-port": "^1.3.2",
-    "@types/react-dom": "^18.0.4",
+    "@types/react-dom": "^18.0.5",
     "@types/react-router-config": "^5.0.6",
     "@types/rtl-detect": "^1.0.0",
     "@types/serve-handler": "^6.1.1",
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 8dca637d064b..f5e37ce19c49 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -21,7 +21,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^5.25.0",
+    "@typescript-eslint/utils": "^5.26.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
diff --git a/packages/lqip-loader/package.json b/packages/lqip-loader/package.json
index 1311e978db16..79cb3258bb3d 100644
--- a/packages/lqip-loader/package.json
+++ b/packages/lqip-loader/package.json
@@ -20,7 +20,7 @@
     "@docusaurus/logger": "2.0.0-beta.20",
     "file-loader": "^6.2.0",
     "lodash": "^4.17.21",
-    "sharp": "^0.30.4",
+    "sharp": "^0.30.5",
     "tslib": "^2.4.0"
   },
   "engines": {
diff --git a/packages/stylelint-copyright/package.json b/packages/stylelint-copyright/package.json
index 795992466776..7a53f9f7657b 100644
--- a/packages/stylelint-copyright/package.json
+++ b/packages/stylelint-copyright/package.json
@@ -14,7 +14,7 @@
     "directory": "packages/stylelint-copyright"
   },
   "dependencies": {
-    "stylelint": "^14.8.3",
+    "stylelint": "^14.8.5",
     "tslib": "^2.4.0"
   }
 }
diff --git a/website/package.json b/website/package.json
index 8f9c678d1271..f03ae9a0a1d2 100644
--- a/website/package.json
+++ b/website/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@crowdin/cli": "^3.7.8",
-    "@crowdin/crowdin-api-client": "^1.18.0",
+    "@crowdin/crowdin-api-client": "^1.18.1",
     "@docusaurus/core": "2.0.0-beta.20",
     "@docusaurus/logger": "2.0.0-beta.20",
     "@docusaurus/plugin-client-redirects": "2.0.0-beta.20",
@@ -48,7 +48,7 @@
     "@docusaurus/utils": "2.0.0-beta.20",
     "@docusaurus/utils-common": "2.0.0-beta.20",
     "@popperjs/core": "^2.11.5",
-    "@swc/core": "^1.2.189",
+    "@swc/core": "^1.2.194",
     "clsx": "^1.1.1",
     "color": "^4.2.3",
     "fs-extra": "^10.1.0",
@@ -57,12 +57,13 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-lite-youtube-embed": "^2.2.2",
-    "react-medium-image-zoom": "^4.4.0",
+    "react-medium-image-zoom": "^4.4.3",
     "react-popper": "^2.3.0",
     "rehype-katex": "^6.0.2",
     "remark-math": "^3.0.1",
     "swc-loader": "^0.2.1",
     "unist-util-visit": "^2.0.3",
+    "webpack": "^5.72.1",
     "workbox-routing": "^6.5.3",
     "workbox-strategies": "^6.5.3"
   },
diff --git a/yarn.lock b/yarn.lock
index 4c52edca54a9..abc15d47e10c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -132,9 +132,9 @@
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@apideck/better-ajv-errors@^0.3.1":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.3.tgz#ab0b1e981e1749bf59736cf7ebe25cfc9f949c15"
-  integrity sha512-9o+HO2MbJhJHjDYZaDxJmSDckvDpiuItEsrIShV0DXeCshXWRHhqYyU/PKHMkuClOmFnZhRd6wzv4vpDu/dRKg==
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.4.tgz#f89924dd4efd04a51835db7eb549a7177e0ca727"
+  integrity sha512-Ic2d8ZT6HJiSikGVQvSklaFyw1OUv4g8sDOxa0PXSlbmN/3gL5IO1WYY9DOwTDqOFmjWoqG1yaaKnPDqYCE9KA==
   dependencies:
     json-schema "^0.4.0"
     jsonpointer "^5.0.0"
@@ -174,42 +174,42 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.15.5", "@babel/core@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.0.tgz#c58d04d7c6fbfb58ea7681e2b9145cfb62726756"
-  integrity sha512-Xyw74OlJwDijToNi0+6BBI5mLLR5+5R3bcSH80LXzjzEGEUlvNzujEE71BaD/ApEZHAvFI/Mlmp4M5lIkdeeWw==
+"@babel/core@^7.11.1", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.15.5", "@babel/core@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876"
+  integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.0"
-    "@babel/helper-compilation-targets" "^7.17.10"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-compilation-targets" "^7.18.2"
     "@babel/helper-module-transforms" "^7.18.0"
-    "@babel/helpers" "^7.18.0"
+    "@babel/helpers" "^7.18.2"
     "@babel/parser" "^7.18.0"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/eslint-parser@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"
-  integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==
+"@babel/eslint-parser@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz#e14dee36c010edfb0153cf900c2b0815e82e3245"
+  integrity sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==
   dependencies:
     eslint-scope "^5.1.1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.12.5", "@babel/generator@^7.18.0", "@babel/generator@^7.7.2":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.0.tgz#46d28e8a18fc737b028efb25ab105d74473af43f"
-  integrity sha512-81YO9gGx6voPXlvYdZBliFXAZU8vZ9AZ6z+CjlmcnaeOcYSFbMTpdeDUO9xD9dh/68Vq03I8ZspfUTPfitcDHg==
+"@babel/generator@^7.12.5", "@babel/generator@^7.18.2", "@babel/generator@^7.7.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
+  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
   dependencies:
-    "@babel/types" "^7.18.0"
+    "@babel/types" "^7.18.2"
     "@jridgewell/gen-mapping" "^0.3.0"
     jsesc "^2.5.1"
 
@@ -228,10 +228,10 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe"
-  integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b"
+  integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==
   dependencies:
     "@babel/compat-data" "^7.17.10"
     "@babel/helper-validator-option" "^7.16.7"
@@ -273,12 +273,10 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
+  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
 
 "@babel/helper-explode-assignable-expression@^7.16.7":
   version "7.16.7"
@@ -302,7 +300,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
+"@babel/helper-member-expression-to-functions@^7.17.7":
   version "7.17.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
   integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
@@ -357,22 +355,22 @@
     "@babel/types" "^7.16.8"
 
 "@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0"
+  integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-member-expression-to-functions" "^7.17.7"
     "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
+  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.2"
 
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
@@ -408,14 +406,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.12.5", "@babel/helpers@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.0.tgz#aff37c3590de42102b54842446146d0205946370"
-  integrity sha512-AE+HMYhmlMIbho9nbvicHyxFwhrO+xhKB6AhRxzl8w46Yj0VXTZjEsAoBVC7rB2I0jzX+yWyVybnO08qkfx6kg==
+"@babel/helpers@^7.12.5", "@babel/helpers@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384"
+  integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.18.0"
-    "@babel/types" "^7.18.0"
+    "@babel/traverse" "^7.18.2"
+    "@babel/types" "^7.18.2"
 
 "@babel/highlight@^7.16.7":
   version "7.17.12"
@@ -426,10 +424,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.0.tgz#10a8d4e656bc01128d299a787aa006ce1a91e112"
-  integrity sha512-AqDccGC+m5O/iUStSJy3DGRIUFu7WbY/CppZYwrEUB4N0tZlnI8CSTsgL7v5fHVFmUbRv2sd+yy27o8Ydt4MGg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.18.0", "@babel/parser@^7.18.3":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.3.tgz#39e99c7b0c4c56cef4d1eed8de9f506411c2ebc2"
+  integrity sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12":
   version "7.17.12"
@@ -820,7 +818,7 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/plugin-syntax-flow" "^7.17.12"
 
-"@babel/plugin-transform-for-of@^7.17.12":
+"@babel/plugin-transform-for-of@^7.18.1":
   version "7.18.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036"
   integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==
@@ -859,14 +857,14 @@
     "@babel/helper-plugin-utils" "^7.17.12"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.0.tgz#3be575e19fbd273d42adbc84566b1fad3582b3db"
-  integrity sha512-cCeR0VZWtfxWS4YueAK2qtHtBPJRSaJcMlbS8jhSIm/A3E2Kpro4W1Dn4cqJtp59dtWfXjQwK7SPKF8ghs7rlw==
+"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
+  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.18.0"
     "@babel/helper-plugin-utils" "^7.17.12"
-    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-simple-access" "^7.18.2"
     babel-plugin-dynamic-import-node "^2.3.3"
 
 "@babel/plugin-transform-modules-systemjs@^7.18.0":
@@ -980,10 +978,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
-"@babel/plugin-transform-runtime@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.0.tgz#894cdab4b353dcb7639f03fb74c59db1d344f71c"
-  integrity sha512-7kM/jJ3DD/y1hDPn0jov12DoUIFsxLiItprhNydUSibxaywaxNqKwq+ODk72J9ePn4LWobIc5ik6TAJhVl8IkQ==
+"@babel/plugin-transform-runtime@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.2.tgz#04637de1e45ae8847ff14b9beead09c33d34374d"
+  integrity sha512-mr1ufuRMfS52ttq+1G1PD8OJNqgcTFjq3hwn8SZ5n1x1pBhi0E36rYMdTK0TsKtApJ4lDEdfXJwtGobQMHSMPg==
   dependencies:
     "@babel/helper-module-imports" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.17.12"
@@ -1014,10 +1012,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.17.12":
-  version "7.17.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.17.12.tgz#4aec0a18f39dd86c442e1d077746df003e362c6e"
-  integrity sha512-kAKJ7DX1dSRa2s7WN1xUAuaQmkTpN+uig4wCKWivVXIObqGbVTUlSavHyfI2iZvz89GFAMGm9p2DBJ4Y1Tp0hw==
+"@babel/plugin-transform-template-literals@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28"
+  integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.17.12"
 
@@ -1052,13 +1050,13 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.0.tgz#ec7e51f4c6e026816000b230ed7cf74a1530d91d"
-  integrity sha512-cP74OMs7ECLPeG1reiCQ/D/ypyOxgfm8uR6HRYV23vTJ7Lu1nbgj9DQDo/vH59gnn7GOAwtTDPPYV4aXzsMKHA==
+"@babel/preset-env@^7.11.0", "@babel/preset-env@^7.15.6", "@babel/preset-env@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a"
+  integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==
   dependencies:
     "@babel/compat-data" "^7.17.10"
-    "@babel/helper-compilation-targets" "^7.17.10"
+    "@babel/helper-compilation-targets" "^7.18.2"
     "@babel/helper-plugin-utils" "^7.17.12"
     "@babel/helper-validator-option" "^7.16.7"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12"
@@ -1103,12 +1101,12 @@
     "@babel/plugin-transform-dotall-regex" "^7.16.7"
     "@babel/plugin-transform-duplicate-keys" "^7.17.12"
     "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.17.12"
+    "@babel/plugin-transform-for-of" "^7.18.1"
     "@babel/plugin-transform-function-name" "^7.16.7"
     "@babel/plugin-transform-literals" "^7.17.12"
     "@babel/plugin-transform-member-expression-literals" "^7.16.7"
     "@babel/plugin-transform-modules-amd" "^7.18.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.18.2"
     "@babel/plugin-transform-modules-systemjs" "^7.18.0"
     "@babel/plugin-transform-modules-umd" "^7.18.0"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12"
@@ -1121,12 +1119,12 @@
     "@babel/plugin-transform-shorthand-properties" "^7.16.7"
     "@babel/plugin-transform-spread" "^7.17.12"
     "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.17.12"
+    "@babel/plugin-transform-template-literals" "^7.18.2"
     "@babel/plugin-transform-typeof-symbol" "^7.17.12"
     "@babel/plugin-transform-unicode-escapes" "^7.16.7"
     "@babel/plugin-transform-unicode-regex" "^7.16.7"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.0"
+    "@babel/types" "^7.18.2"
     babel-plugin-polyfill-corejs2 "^0.3.0"
     babel-plugin-polyfill-corejs3 "^0.5.0"
     babel-plugin-polyfill-regenerator "^0.3.0"
@@ -1185,18 +1183,18 @@
     pirates "^4.0.5"
     source-map-support "^0.5.16"
 
-"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.0.tgz#eed03023c5226b1e2b2ba32b8b6af5cb0518a6c7"
-  integrity sha512-G5FaGZOWORq9zthDjIrjib5XlcddeqLbIiDO3YQsut6j7aGf76xn0umUC/pA6+nApk3hQJF4JzLzg5PCl6ewJg==
+"@babel/runtime-corejs3@^7.10.2", "@babel/runtime-corejs3@^7.18.3":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz#52f0241a31e0ec61a6187530af6227c2846bd60c"
+  integrity sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==
   dependencies:
     core-js-pure "^3.20.2"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.0", "@babel/runtime@^7.8.4":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.0.tgz#6d77142a19cb6088f0af662af1ada37a604d34ae"
-  integrity sha512-YMQvx/6nKEaucl0MY56mwIG483xk8SDNdlUwb2Ts6FUpr7fm85DxEmsY18LXBNhcTz6tO6JwZV8w1W06v8UKeg==
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.3", "@babel/runtime@^7.18.3", "@babel/runtime@^7.8.4":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
+  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -1209,26 +1207,26 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.7.2":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.0.tgz#0e5ec6db098660b2372dd63d096bf484e32d27ba"
-  integrity sha512-oNOO4vaoIQoGjDQ84LgtF/IAlxlyqL4TUuoQ7xLkQETFaHkY1F7yazhB4Kt3VcZGL0ZF/jhrEpnXqUb0M7V3sw==
+"@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.7.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8"
+  integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.18.0"
-    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
     "@babel/helper-function-name" "^7.17.9"
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
     "@babel/parser" "^7.18.0"
-    "@babel/types" "^7.18.0"
+    "@babel/types" "^7.18.2"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.0.tgz#ef523ea349722849cb4bf806e9342ede4d071553"
-  integrity sha512-vhAmLPAiC8j9K2GnsnLPCIH5wCrPpYIVBCWRBFDCB7Y/BXLqi/O+1RSTTM2bsmg6U/551+FCf9PNPxjABmxHTw==
+"@babel/types@^7.0.0", "@babel/types@^7.12.7", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.18.2", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.2.tgz#191abfed79ebe6f4242f643a9a5cbaa36b10b091"
+  integrity sha512-0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q==
   dependencies:
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
@@ -1251,10 +1249,10 @@
     njre "^0.2.0"
     shelljs "^0.8.4"
 
-"@crowdin/crowdin-api-client@^1.18.0":
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/@crowdin/crowdin-api-client/-/crowdin-api-client-1.18.0.tgz#d767cc8a9829f5c2215c9988cb1b62822c4618d4"
-  integrity sha512-s0oqqc5MmvK5UxN557q23m1yi+J/8dv2Qx8zmGzYw81/SjBMSopE5i5IYABFtbTA8+vaP8c0q3UbTlp0qFQJKw==
+"@crowdin/crowdin-api-client@^1.18.1":
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/@crowdin/crowdin-api-client/-/crowdin-api-client-1.18.1.tgz#7eae15ac6d947cfd74de0ed3bdeb6a0dcb883f56"
+  integrity sha512-U3ERDrd+EsQXoeLuVZPQdtTOSHOqgLJMe8xfFvGIZX4KM/vcltvXVfehSOUcUo0tG+DNAwFRsrnIcgbK6S534w==
   dependencies:
     axios "0.21.3"
 
@@ -1355,9 +1353,9 @@
   integrity sha512-MrFyswFHnPh4H0u6IlV4eHy+ZCUrrHzeL161LyTOqCvaKpbZavMgNYXzZqTF9xafO0iLgwKrl+Gkclu1KVBg0Q==
 
 "@cspell/dict-dart@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dart/-/dict-dart-1.1.0.tgz#d79689493debdad231efe495bd1460bff1d2f577"
-  integrity sha512-bBqZINm+RVjMgUrAhRzv/xx3jc3dkIqO0higPbsK+63IAtMNY3EiQnEO4eapbU+qAhyvICY9hZQZXy5Ux4p+Pw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-dart/-/dict-dart-1.1.1.tgz#d4da9cf72e5df369b6d9ebe588f9c1474adf3556"
+  integrity sha512-XBOCpezXrgFN18kGEwqMpTUGZdw4BjCoJrNOo6qBdcdZySCrEHLwELraLOkcSba2kM4stmTp0t59FkwtP8TKOA==
 
 "@cspell/dict-django@^2.0.0":
   version "2.0.0"
@@ -1430,9 +1428,9 @@
   integrity sha512-9f5LDATlAiXRGqxLxgqbOLlQxuMW2zcN7tBgxwtN+4u90vM03ZUOR/gKIuDV/y0ZuAiWBIjA73cjk8DJ13Q1eA==
 
 "@cspell/dict-latex@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-2.0.3.tgz#6bbbdef07074256368e76a7c7c56940e91c14acc"
-  integrity sha512-shNEP20yLLzZ3iURg7241uUKO5vKvoPcd311uiMch0L0qoiC057aV9nawjQIDIgQQZvYT04Mem8N45/jnqg9cA==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-2.0.4.tgz#b201fa2cc25ab8753b0a09f3c32ee0e068c5d20e"
+  integrity sha512-uqnfQiDQwHL4QTtXQyJdTx6Ol9WDu4c2jMSsL20BIe1wXGaGuGNSIwHEiJyGv7VEBpZTpqx38I4mpKdAERG+gw==
 
 "@cspell/dict-lorem-ipsum@^2.0.0":
   version "2.0.0"
@@ -1450,9 +1448,9 @@
   integrity sha512-ztBWzhvI+YaMehICSJ65cohhjQqoztxf9vrS3YckOiVGBFvUMaFVNdX9klQkvrLcS/O4+2PzoGeIEkmf99amLA==
 
 "@cspell/dict-npm@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-2.0.3.tgz#044d71c36cf322f2816a77978bfd5dc21698667c"
-  integrity sha512-K/rnVhmHkR3jfdo7o8P2NDKyMcpVe9pUBiFDY1y2C0YqZXIxCz1f5hObm/hxyO+Vbn5VLU3TKU5fZ5z3LspXOg==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-2.0.5.tgz#d5b77025fcb46db843091e002409faffcfccade0"
+  integrity sha512-KuPL5fKaqyG9ACrrinNt84FhVdh23VRtxDLO8MtGUdStca9tjfjPdmP2YF/5VkEKmpKYkfFKVcBUk9RgVkx5bw==
 
 "@cspell/dict-php@^2.0.0":
   version "2.0.0"
@@ -1465,19 +1463,19 @@
   integrity sha512-6uvEhLiGmG3u9TFkM1TYcky6aL9Yk7Sk3KJwoTYBaQJY2KqrprgyQtW6yxIw9oU52VRHlq3KKvSAA9Q26+SIkQ==
 
 "@cspell/dict-public-licenses@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.4.tgz#13c2af357e7139bf3896eba58e0feb9f51053b3f"
-  integrity sha512-h4xULfVEDUeWyvp1OO19pcGDqWcBEQ7WGMp3QBHyYpjsamlzsyYYjCRSY2ZvpM7wruDmywSRFmRHJ/+uNFT7nA==
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.5.tgz#b4eeb08107b83966913689fcb09f495da249233d"
+  integrity sha512-N9bttzzhmCq/BN/TeP43075kj9TeaR8l9v0SPre05BRWsChVrWuMM1UvsT4ADXnsYJNl1xcn+q191S/fIzQhBg==
 
 "@cspell/dict-python@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-3.0.5.tgz#6a384e950353521b8e4fc7e417d8ddd4fbcb9f8f"
-  integrity sha512-0BRxUndYQ2Iom9ZpN5DjUdF2E5fodw1Th/7rlhxxy45fYXUZmfXDvYoaQaymfHP0ZQhH56MCuOUNa/YMcYJtww==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-3.0.6.tgz#884f398e053a5d500adc9de47d1f1049a7afcc9c"
+  integrity sha512-tzxJ4sd9ZGhAUKg/WJJpQGDNtoHvM8Wn+iS2+PnQj2/LTHBW4mnaCogsGsBtYu8C4b2+BEQs+tc5808AeEfLug==
 
 "@cspell/dict-r@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-1.0.2.tgz#4f21b240427e9bbaab8f82e0e20122d6b3cf7cee"
-  integrity sha512-Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-1.0.3.tgz#1480016695ee119cf63fa8c71b161d033bbb9029"
+  integrity sha512-u2qeXd4cx/TvTVcmkvA+sK6f4K1uMAMO6QPMSr1pSvqGElPRP1mIBXmuiSuBzLO3LbsJuUEHw5Cp3/bxIB6rNA==
 
 "@cspell/dict-ruby@^2.0.1":
   version "2.0.1"
@@ -1495,14 +1493,14 @@
   integrity sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==
 
 "@cspell/dict-software-terms@^2.1.7":
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.7.tgz#30d45d23003980e01854d57788c6c134fa0387f5"
-  integrity sha512-2FW5MlbazmWPFHzMh2xKYFcYnX+E5MdOPRrfYkbVXvWecA0466l54V+op2zlh1CbngMk4eY7AY3qahfWv6gDHA==
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.8.tgz#2db1d3ce7c125552e86503bb09379041787e1a07"
+  integrity sha512-D9ECefkdbr5B0yLimy7nmEBl3AHPsweMG1wHatlCIT9uFwwqaq5e+ngbYrntEhMa6afkYY+LGOLbZ1L1dfpLVg==
 
 "@cspell/dict-swift@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-swift/-/dict-swift-1.0.2.tgz#8d8f7f7a5c8d7cbcdb46fcf4526938ce9cb687a4"
-  integrity sha512-IrMcRO7AYB2qU5cj4ttZyEbd04DRNOG6Iha106qGGmn4P096m+Y7lOnSLJx/rZbD/cAT3Z/7i465Lr1J93j7yg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-swift/-/dict-swift-1.0.3.tgz#b819da0ca2c5dfecdd61bec55181636a06d23677"
+  integrity sha512-yOBLSaRD0AnkkkndJ8PuB82Evp6lA2xItf2AWsnPfCCgxp5Ojk6uUBC/WQBSkzkCAOGbXyHsu9D97tsOx2c6cw==
 
 "@cspell/dict-typescript@^2.0.0":
   version "2.0.0"
@@ -1563,7 +1561,7 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1":
+"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -1599,6 +1597,11 @@
   resolved "https://registry.yarnpkg.com/@hutson/parse-repository-url/-/parse-repository-url-3.0.2.tgz#98c23c950a3d9b6c8f0daed06da6c3af06981340"
   integrity sha512-H9XAx3hc0BQHY6l+IFSWHDySypcXsvsuLhgYLUGywmJ5pswRVQJUHpOsobnLYp2ZUaUlKiKDrgWWhosOwAEM8Q==
 
+"@isaacs/string-locale-compare@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
+  integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -1870,39 +1873,40 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
-"@lerna/add@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
-  integrity sha512-cpmAH1iS3k8JBxNvnMqrGTTjbY/ZAiKa1ChJzFevMYY3eeqbvhsBKnBcxjRXtdrJ6bd3dCQM+ZtK+0i682Fhng==
-  dependencies:
-    "@lerna/bootstrap" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/add@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/add/-/add-5.0.0.tgz#0545e2eef157c142d82ba765467c27b36fe53ce8"
+  integrity sha512-KdIOQL+88iHU9zuAU8Be1AL4cOVmm77nlckylsNaVVTiomNipr/h7lStiBO52BoMkwKzNwOH6He5HGY0Yo7s2w==
+  dependencies:
+    "@lerna/bootstrap" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/filter-options" "5.0.0"
+    "@lerna/npm-conf" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     dedent "^0.7.0"
     npm-package-arg "^8.1.0"
     p-map "^4.0.0"
-    pacote "^11.2.6"
+    pacote "^13.4.1"
     semver "^7.3.4"
 
-"@lerna/bootstrap@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-4.0.0.tgz#5f5c5e2c6cfc8fcec50cb2fbe569a8c607101891"
-  integrity sha512-RkS7UbeM2vu+kJnHzxNRCLvoOP9yGNgkzRdy4UV2hNalD7EP41bLvRVOwRYQ7fhc2QcbhnKNdOBihYRL0LcKtw==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/has-npm-version" "4.0.0"
-    "@lerna/npm-install" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/rimraf-dir" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/symlink-binary" "4.0.0"
-    "@lerna/symlink-dependencies" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/bootstrap@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/bootstrap/-/bootstrap-5.0.0.tgz#624b67a4631c7455b98cfed4dbb2e38b27025a7a"
+  integrity sha512-2m1BxKbYwDABy+uE/Da3EQM61R58bI3YQ0o1rsFQq1u0ltL9CJxw1o0lMg84hwMsBb4D+kLIXLqetYlLVgbr0Q==
+  dependencies:
+    "@lerna/command" "5.0.0"
+    "@lerna/filter-options" "5.0.0"
+    "@lerna/has-npm-version" "5.0.0"
+    "@lerna/npm-install" "5.0.0"
+    "@lerna/package-graph" "5.0.0"
+    "@lerna/pulse-till-done" "5.0.0"
+    "@lerna/rimraf-dir" "5.0.0"
+    "@lerna/run-lifecycle" "5.0.0"
+    "@lerna/run-topologically" "5.0.0"
+    "@lerna/symlink-binary" "5.0.0"
+    "@lerna/symlink-dependencies" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
+    "@npmcli/arborist" "5.2.0"
     dedent "^0.7.0"
     get-port "^5.1.1"
     multimatch "^5.0.0"
@@ -1911,103 +1915,102 @@
     p-map "^4.0.0"
     p-map-series "^2.1.0"
     p-waterfall "^2.1.1"
-    read-package-tree "^5.3.1"
     semver "^7.3.4"
 
-"@lerna/changed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-4.0.0.tgz#b9fc76cea39b9292a6cd263f03eb57af85c9270b"
-  integrity sha512-cD+KuPRp6qiPOD+BO6S6SN5cARspIaWSOqGBpGnYzLb4uWT8Vk4JzKyYtc8ym1DIwyoFXHosXt8+GDAgR8QrgQ==
+"@lerna/changed@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/changed/-/changed-5.0.0.tgz#fb3cdd5f281683a461c3099cbcf0978e23b33140"
+  integrity sha512-A24MHipPGODmzQBH1uIMPPUUOc1Zm7Qe/eSYzm52bFHtVxWH0nIVXfunadoMX32NhzKQH3Sw8X2rWHPQSRoUvA==
   dependencies:
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/listable" "4.0.0"
-    "@lerna/output" "4.0.0"
+    "@lerna/collect-updates" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/listable" "5.0.0"
+    "@lerna/output" "5.0.0"
 
-"@lerna/check-working-tree@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-4.0.0.tgz#257e36a602c00142e76082a19358e3e1ae8dbd58"
-  integrity sha512-/++bxM43jYJCshBiKP5cRlCTwSJdRSxVmcDAXM+1oUewlZJVSVlnks5eO0uLxokVFvLhHlC5kHMc7gbVFPHv6Q==
+"@lerna/check-working-tree@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/check-working-tree/-/check-working-tree-5.0.0.tgz#e7b653b78c3bb96db7a00f6a74018e2bb88ec088"
+  integrity sha512-PnUMdpT2qS4o+vs+7l5fFIizstGdqSkhLG+Z9ZiY5OMtnGd+pmAFQFlbLSZSmdvQSOSobl9fhB1St8qhPD60xQ==
   dependencies:
-    "@lerna/collect-uncommitted" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/collect-uncommitted" "5.0.0"
+    "@lerna/describe-ref" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
 
-"@lerna/child-process@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-4.0.0.tgz#341b96a57dffbd9705646d316e231df6fa4df6e1"
-  integrity sha512-XtCnmCT9eyVsUUHx6y/CTBYdV9g2Cr/VxyseTWBgfIur92/YKClfEtJTbOh94jRT62hlKLqSvux/UhxXVh613Q==
+"@lerna/child-process@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-5.0.0.tgz#1c7663d2910431f6c25543fd53998ae95b2dac19"
+  integrity sha512-cFVNkedrlU8XTt15EvUtQ84hqtV4oToQW/elKNv//mhCz06HY8Y+Ia6XevK2zrIhZjS6DT576F/7SmTk3vnpmg==
   dependencies:
     chalk "^4.1.0"
     execa "^5.0.0"
     strong-log-transformer "^2.1.0"
 
-"@lerna/clean@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-4.0.0.tgz#8f778b6f2617aa2a936a6b5e085ae62498e57dc5"
-  integrity sha512-uugG2iN9k45ITx2jtd8nEOoAtca8hNlDCUM0N3lFgU/b1mEQYAPRkqr1qs4FLRl/Y50ZJ41wUz1eazS+d/0osA==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/rimraf-dir" "4.0.0"
+"@lerna/clean@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/clean/-/clean-5.0.0.tgz#2b5cf202ab3eca18a075b292c55e6641d18b1b8f"
+  integrity sha512-7B+0Nx6MEPmCfnEa1JFyZwJsC7qlGrikWXyLglLb/wcbapYVsuDauOl9AT1iOFoXKw82P77HWYUKWeD9DQgw/w==
+  dependencies:
+    "@lerna/command" "5.0.0"
+    "@lerna/filter-options" "5.0.0"
+    "@lerna/prompt" "5.0.0"
+    "@lerna/pulse-till-done" "5.0.0"
+    "@lerna/rimraf-dir" "5.0.0"
     p-map "^4.0.0"
     p-map-series "^2.1.0"
     p-waterfall "^2.1.1"
 
-"@lerna/cli@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-4.0.0.tgz#8eabd334558836c1664df23f19acb95e98b5bbf3"
-  integrity sha512-Neaw3GzFrwZiRZv2g7g6NwFjs3er1vhraIniEs0jjVLPMNC4eata0na3GfE5yibkM/9d3gZdmihhZdZ3EBdvYA==
+"@lerna/cli@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/cli/-/cli-5.0.0.tgz#f440f6664aa6c22bb58e69aacfde655c831de2f9"
+  integrity sha512-g8Nifko8XNySOl8u2molSHVl+fk/E1e5FSn/W2ekeijmc3ezktp+xbPWofNq71N/d297+KPQpLBfwzXSo9ufIQ==
   dependencies:
-    "@lerna/global-options" "4.0.0"
+    "@lerna/global-options" "5.0.0"
     dedent "^0.7.0"
     npmlog "^4.1.2"
     yargs "^16.2.0"
 
-"@lerna/collect-uncommitted@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-4.0.0.tgz#855cd64612969371cfc2453b90593053ff1ba779"
-  integrity sha512-ufSTfHZzbx69YNj7KXQ3o66V4RC76ffOjwLX0q/ab//61bObJ41n03SiQEhSlmpP+gmFbTJ3/7pTe04AHX9m/g==
+"@lerna/collect-uncommitted@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-uncommitted/-/collect-uncommitted-5.0.0.tgz#2843f98995c8bcc1d783d1d9739122c79378f3c5"
+  integrity sha512-mga/2S9rK0TP5UCulWiCTrC/uKaiIlOro1n8R3oCw6eRw9eupCSRx5zGI7pdh8CPD82MDL7w0a6OTep3WBSBVA==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.0.0"
     chalk "^4.1.0"
     npmlog "^4.1.2"
 
-"@lerna/collect-updates@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-4.0.0.tgz#8e208b1bafd98a372ff1177f7a5e288f6bea8041"
-  integrity sha512-bnNGpaj4zuxsEkyaCZLka9s7nMs58uZoxrRIPJ+nrmrZYp1V5rrd+7/NYTuunOhY2ug1sTBvTAxj3NZQ+JKnOw==
+"@lerna/collect-updates@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/collect-updates/-/collect-updates-5.0.0.tgz#cce16b9e8136e1e7bc33fe0fb12b283e538fa658"
+  integrity sha512-X82i8SVgBXLCk8vbKWfQPRLTAXROCANL8Z/bU1l6n7yycsHKdjrrlNi1+KprFdfRsMvSm10R4qPNcl9jgsp/IA==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/describe-ref" "5.0.0"
     minimatch "^3.0.4"
     npmlog "^4.1.2"
     slash "^3.0.0"
 
-"@lerna/command@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-4.0.0.tgz#991c7971df8f5bf6ae6e42c808869a55361c1b98"
-  integrity sha512-LM9g3rt5FsPNFqIHUeRwWXLNHJ5NKzOwmVKZ8anSp4e1SPrv2HNc1V02/9QyDDZK/w+5POXH5lxZUI1CHaOK/A==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/project" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    "@lerna/write-log-file" "4.0.0"
+"@lerna/command@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/command/-/command-5.0.0.tgz#cdc9f32a6b1c7153fe7150d642d2a420a3d0797d"
+  integrity sha512-j7/apU5d/nhSc1qIZgcV03KyO5jz3y7cwSum3IuK8/XF6rKwt3FVnbue1V3l9sJ6IRJjsRGKyViB1IdP5nSX4Q==
+  dependencies:
+    "@lerna/child-process" "5.0.0"
+    "@lerna/package-graph" "5.0.0"
+    "@lerna/project" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
+    "@lerna/write-log-file" "5.0.0"
     clone-deep "^4.0.1"
     dedent "^0.7.0"
     execa "^5.0.0"
     is-ci "^2.0.0"
     npmlog "^4.1.2"
 
-"@lerna/conventional-commits@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-4.0.0.tgz#660fb2c7b718cb942ead70110df61f18c6f99750"
-  integrity sha512-CSUQRjJHFrH8eBn7+wegZLV3OrNc0Y1FehYfYGhjLE2SIfpCL4bmfu/ViYuHh9YjwHaA+4SX6d3hR+xkeseKmw==
+"@lerna/conventional-commits@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/conventional-commits/-/conventional-commits-5.0.0.tgz#7f9c16fda074c9ed897cb695f5ae23678dd441eb"
+  integrity sha512-tUCRTAycDCtSlCEI0hublq4uKHeV0UHpwIb3Fdt6iv2AoTSPBSX/Dwu/6VqguysOSEkkR4M2JCOLvJCl4IMxwg==
   dependencies:
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/validation-error" "5.0.0"
     conventional-changelog-angular "^5.0.12"
     conventional-changelog-core "^4.2.2"
     conventional-recommended-bump "^6.1.0"
@@ -2019,31 +2022,31 @@
     pify "^5.0.0"
     semver "^7.3.4"
 
-"@lerna/create-symlink@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-4.0.0.tgz#8c5317ce5ae89f67825443bd7651bf4121786228"
-  integrity sha512-I0phtKJJdafUiDwm7BBlEUOtogmu8+taxq6PtIrxZbllV9hWg59qkpuIsiFp+no7nfRVuaasNYHwNUhDAVQBig==
+"@lerna/create-symlink@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create-symlink/-/create-symlink-5.0.0.tgz#eccef7f89fdc4d7cd904694d9e2eb0b582073b5e"
+  integrity sha512-nHYNacrh15Y0yEofVlUVu9dhf4JjIn9hY7v7rOUXzUeQ91iXY5Q3PVHkBeRUigyT5CWP5qozZwraCMwp+lDWYg==
   dependencies:
     cmd-shim "^4.1.0"
     fs-extra "^9.1.0"
     npmlog "^4.1.2"
 
-"@lerna/create@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-4.0.0.tgz#b6947e9b5dfb6530321952998948c3e63d64d730"
-  integrity sha512-mVOB1niKByEUfxlbKTM1UNECWAjwUdiioIbRQZEeEabtjCL69r9rscIsjlGyhGWCfsdAG5wfq4t47nlDXdLLag==
+"@lerna/create@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/create/-/create-5.0.0.tgz#4aac3d1f2c1f6d7fadde49d3663b318fcdd39b06"
+  integrity sha512-sdFTVTLOVuhHpzIYhFAwK0Ry3p4d7uMe9ZG/Ii128/pB9kEEfCth+1WBq6mBpYZ5mOLLgxJbWalbiJFl0toQRw==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/npm-conf" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     dedent "^0.7.0"
     fs-extra "^9.1.0"
     globby "^11.0.2"
     init-package-json "^2.0.2"
     npm-package-arg "^8.1.0"
     p-reduce "^2.1.0"
-    pacote "^11.2.6"
+    pacote "^13.4.1"
     pify "^5.0.0"
     semver "^7.3.4"
     slash "^3.0.0"
@@ -2052,217 +2055,217 @@
     whatwg-url "^8.4.0"
     yargs-parser "20.2.4"
 
-"@lerna/describe-ref@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-4.0.0.tgz#53c53b4ea65fdceffa072a62bfebe6772c45d9ec"
-  integrity sha512-eTU5+xC4C5Gcgz+Ey4Qiw9nV2B4JJbMulsYJMW8QjGcGh8zudib7Sduj6urgZXUYNyhYpRs+teci9M2J8u+UvQ==
+"@lerna/describe-ref@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/describe-ref/-/describe-ref-5.0.0.tgz#f0676843642e8880133783a9f059e6cb4c027fe1"
+  integrity sha512-iLvMHp3nl4wcMR3/lVkz0ng7pAHfLQ7yvz2HsYBq7wllCcEzpchzPgyVzyvbpJ+Ke/MKjQTsrHE/yOGOH67GVw==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.0.0"
     npmlog "^4.1.2"
 
-"@lerna/diff@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-4.0.0.tgz#6d3071817aaa4205a07bf77cfc6e932796d48b92"
-  integrity sha512-jYPKprQVg41+MUMxx6cwtqsNm0Yxx9GDEwdiPLwcUTFx+/qKCEwifKNJ1oGIPBxyEHX2PFCOjkK39lHoj2qiag==
+"@lerna/diff@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/diff/-/diff-5.0.0.tgz#844333f5478fc4993c4389fee1e0cd8eff9114fe"
+  integrity sha512-S4XJ6i9oP77cSmJ3oRUJGMgrI+jOTmkYWur2nqgSdyJBE1J2eClgTJknb3WAHg2cHALT18WzFqNghFOGM+9dRA==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     npmlog "^4.1.2"
 
-"@lerna/exec@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-4.0.0.tgz#eb6cb95cb92d42590e9e2d628fcaf4719d4a8be6"
-  integrity sha512-VGXtL/b/JfY84NB98VWZpIExfhLOzy0ozm/0XaS4a2SmkAJc5CeUfrhvHxxkxiTBLkU+iVQUyYEoAT0ulQ8PCw==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/profiler" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/exec@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/exec/-/exec-5.0.0.tgz#a59dd094e456ea46cfa8f713da0ea3334a7ec9ac"
+  integrity sha512-g5i+2RclCGWLsl88m11j99YM2Gqnwa2lxZ5tDeqqWZFno6Dlvop17Yl6/MFH42EgM2DQHUUCammvcLIAJ2XwEA==
+  dependencies:
+    "@lerna/child-process" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/filter-options" "5.0.0"
+    "@lerna/profiler" "5.0.0"
+    "@lerna/run-topologically" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     p-map "^4.0.0"
 
-"@lerna/filter-options@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-4.0.0.tgz#ac94cc515d7fa3b47e2f7d74deddeabb1de5e9e6"
-  integrity sha512-vV2ANOeZhOqM0rzXnYcFFCJ/kBWy/3OA58irXih9AMTAlQLymWAK0akWybl++sUJ4HB9Hx12TOqaXbYS2NM5uw==
+"@lerna/filter-options@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-options/-/filter-options-5.0.0.tgz#1d2606e1d2ed106689b43cc5d41a77b239afb837"
+  integrity sha512-un73aYkXlzKlnDPx2AlqNW+ArCZ20XaX+Y6C0F+av9VZriiBsCgZTnflhih9fiSMnXjN5r9CA8YdWvZqa3oAcQ==
   dependencies:
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/filter-packages" "4.0.0"
+    "@lerna/collect-updates" "5.0.0"
+    "@lerna/filter-packages" "5.0.0"
     dedent "^0.7.0"
     npmlog "^4.1.2"
 
-"@lerna/filter-packages@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-4.0.0.tgz#b1f70d70e1de9cdd36a4e50caa0ac501f8d012f2"
-  integrity sha512-+4AJIkK7iIiOaqCiVTYJxh/I9qikk4XjNQLhE3kixaqgMuHl1NQ99qXRR0OZqAWB9mh8Z1HA9bM5K1HZLBTOqA==
+"@lerna/filter-packages@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/filter-packages/-/filter-packages-5.0.0.tgz#9aae543ab5e45a1b0c3f7ad33e0686ceb8d92c88"
+  integrity sha512-+EIjVVaMPDZ05F/gZa+kcXjBOLXqEamcEIDr+2ZXRgJmnrLx9BBY1B7sBEFHg7JXbeOKS+fKtMGVveV0SzgH3Q==
   dependencies:
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/validation-error" "5.0.0"
     multimatch "^5.0.0"
     npmlog "^4.1.2"
 
-"@lerna/get-npm-exec-opts@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-4.0.0.tgz#dc955be94a4ae75c374ef9bce91320887d34608f"
-  integrity sha512-yvmkerU31CTWS2c7DvmAWmZVeclPBqI7gPVr5VATUKNWJ/zmVcU4PqbYoLu92I9Qc4gY1TuUplMNdNuZTSL7IQ==
+"@lerna/get-npm-exec-opts@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.0.0.tgz#25c1cd7d2b6c1fe903cd144d9f6e2d5cae47429b"
+  integrity sha512-ZOg3kc5FXYA1kVFD2hfJOl64hNASWD6panwD0HlyzXgfKKTDRm/P/qtAqS8WGCzQWgEdx4wvsDe/58Lzzh6QzQ==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/get-packed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-4.0.0.tgz#0989d61624ac1f97e393bdad2137c49cd7a37823"
-  integrity sha512-rfWONRsEIGyPJTxFzC8ECb3ZbsDXJbfqWYyeeQQDrJRPnEJErlltRLPLgC2QWbxFgFPsoDLeQmFHJnf0iDfd8w==
+"@lerna/get-packed@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/get-packed/-/get-packed-5.0.0.tgz#4de7f66184232c805dfca07b9a8c577f6ef02351"
+  integrity sha512-fks7Tg7DvcCZxRWPS3JAWVuLnwjPC/hLlNsdYmK9nN3+RtPhmYQgBjLSONcENw1E46t4Aph72lA9nLcYBLksqw==
   dependencies:
     fs-extra "^9.1.0"
     ssri "^8.0.1"
     tar "^6.1.0"
 
-"@lerna/github-client@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-4.0.0.tgz#2ced67721363ef70f8e12ffafce4410918f4a8a4"
-  integrity sha512-2jhsldZtTKXYUBnOm23Lb0Fx8G4qfSXF9y7UpyUgWUj+YZYd+cFxSuorwQIgk5P4XXrtVhsUesIsli+BYSThiw==
+"@lerna/github-client@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/github-client/-/github-client-5.0.0.tgz#65c984a393b1cbe35c2a707059c645bb9a03395e"
+  integrity sha512-NoEyRkQ8XgBnrjRfC9ph1npfg1/4OdYG+r8lG/1WkJbdt1Wlym4VNZU2BYPMWwSQYMJuppoEr0LL2uuVcS4ZUw==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.0.0"
     "@octokit/plugin-enterprise-rest" "^6.0.1"
     "@octokit/rest" "^18.1.0"
     git-url-parse "^11.4.4"
     npmlog "^4.1.2"
 
-"@lerna/gitlab-client@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-4.0.0.tgz#00dad73379c7b38951d4b4ded043504c14e2b67d"
-  integrity sha512-OMUpGSkeDWFf7BxGHlkbb35T7YHqVFCwBPSIR6wRsszY8PAzCYahtH3IaJzEJyUg6vmZsNl0FSr3pdA2skhxqA==
+"@lerna/gitlab-client@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/gitlab-client/-/gitlab-client-5.0.0.tgz#c4e3d16566a3b07908ee604ce681a09c418481de"
+  integrity sha512-WREAT7qzta9hxNxktTX0x1/sEMpBP+4Gc00QSJYXt+ZzxY0t5RUx/ZK5pQl+IDhtkajrvXT6fSfZjMxxyE8hhQ==
   dependencies:
     node-fetch "^2.6.1"
     npmlog "^4.1.2"
     whatwg-url "^8.4.0"
 
-"@lerna/global-options@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-4.0.0.tgz#c7d8b0de6a01d8a845e2621ea89e7f60f18c6a5f"
-  integrity sha512-TRMR8afAHxuYBHK7F++Ogop2a82xQjoGna1dvPOY6ltj/pEx59pdgcJfYcynYqMkFIk8bhLJJN9/ndIfX29FTQ==
+"@lerna/global-options@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/global-options/-/global-options-5.0.0.tgz#02505c9e468188e3a254c262d58739092de93d8d"
+  integrity sha512-PZYy/3mTZwtA9lNmHHRCc/Ty1W20qGJ/BdDIo4bw/Bk0AOcoBCLT9b3Mjijkl4AbC9+eSGk3flUYapCGVuS32Q==
 
-"@lerna/has-npm-version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-4.0.0.tgz#d3fc3292c545eb28bd493b36e6237cf0279f631c"
-  integrity sha512-LQ3U6XFH8ZmLCsvsgq1zNDqka0Xzjq5ibVN+igAI5ccRWNaUsE/OcmsyMr50xAtNQMYMzmpw5GVLAivT2/YzCg==
+"@lerna/has-npm-version@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/has-npm-version/-/has-npm-version-5.0.0.tgz#ed62c6ef857f068209663aae9f156f06a93dc1bd"
+  integrity sha512-zJPgcml86nhJFJTpT+kjkcafuCFvK7PSq3oDC2KJxwB1bhlYwy+SKtAEypHSsHQ2DwP0YgPITcy1pvtHkie1SA==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.0.0"
     semver "^7.3.4"
 
-"@lerna/import@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-4.0.0.tgz#bde656c4a451fa87ae41733ff8a8da60547c5465"
-  integrity sha512-FaIhd+4aiBousKNqC7TX1Uhe97eNKf5/SC7c5WZANVWtC7aBWdmswwDt3usrzCNpj6/Wwr9EtEbYROzxKH8ffg==
-  dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/import@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/import/-/import-5.0.0.tgz#11cd83ef0fe854c512146fd4165f33519364b97a"
+  integrity sha512-cD+Is7eV/I+ZU0Wlg+yAgKaZbOvfzA7kBj2Qu1HtxeLhc7joTR8PFW1gNjEsvrWOTiaHAtObbo1A+MKYQ/T12g==
+  dependencies:
+    "@lerna/child-process" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/prompt" "5.0.0"
+    "@lerna/pulse-till-done" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     dedent "^0.7.0"
     fs-extra "^9.1.0"
     p-map-series "^2.1.0"
 
-"@lerna/info@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/info/-/info-4.0.0.tgz#b9fb0e479d60efe1623603958a831a88b1d7f1fc"
-  integrity sha512-8Uboa12kaCSZEn4XRfPz5KU9XXoexSPS4oeYGj76s2UQb1O1GdnEyfjyNWoUl1KlJ2i/8nxUskpXIftoFYH0/Q==
+"@lerna/info@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/info/-/info-5.0.0.tgz#649566474d0d133c22bb821f88e7d062a2beace5"
+  integrity sha512-k9TMK81apTjxxpnjfFOABKXndTtHBPgB8UO+I6zKhsfRqVb9FCz2MHOx8cQiSyolvNyGSQdSylSo4p7EBBomQQ==
   dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/output" "4.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/output" "5.0.0"
     envinfo "^7.7.4"
 
-"@lerna/init@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-4.0.0.tgz#dadff67e6dfb981e8ccbe0e6a310e837962f6c7a"
-  integrity sha512-wY6kygop0BCXupzWj5eLvTUqdR7vIAm0OgyV9WHpMYQGfs1V22jhztt8mtjCloD/O0nEe4tJhdG62XU5aYmPNQ==
+"@lerna/init@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/init/-/init-5.0.0.tgz#e35d95a4882aafb4600abf9b32fd1a0056e73ed9"
+  integrity sha512-2n68x7AIqVa+Vev9xF3NV9ba0C599KYf7JsIrQ5ESv4593ftInJpwgMwjroLT3X/Chi4BK7y2/xGmrfFVwgILg==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/command" "4.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/command" "5.0.0"
     fs-extra "^9.1.0"
     p-map "^4.0.0"
     write-json-file "^4.3.0"
 
-"@lerna/link@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-4.0.0.tgz#c3a38aabd44279d714e90f2451e31b63f0fb65ba"
-  integrity sha512-KlvPi7XTAcVOByfaLlOeYOfkkDcd+bejpHMCd1KcArcFTwijOwXOVi24DYomIeHvy6HsX/IUquJ4PPUJIeB4+w==
+"@lerna/link@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/link/-/link-5.0.0.tgz#dbd5aefa0bb22f2fd9d61ee82009fb34eb946298"
+  integrity sha512-00YxQ06TVhQJthOjcuxCCJRjkAM+qM/8Lv0ckdCzBBCSr4RdAGBp6QcAX/gjLNasgmNpyiza3ADet7mCH7uodw==
   dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/package-graph" "4.0.0"
-    "@lerna/symlink-dependencies" "4.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/package-graph" "5.0.0"
+    "@lerna/symlink-dependencies" "5.0.0"
     p-map "^4.0.0"
     slash "^3.0.0"
 
-"@lerna/list@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-4.0.0.tgz#24b4e6995bd73f81c556793fe502b847efd9d1d7"
-  integrity sha512-L2B5m3P+U4Bif5PultR4TI+KtW+SArwq1i75QZ78mRYxPc0U/piau1DbLOmwrdqr99wzM49t0Dlvl6twd7GHFg==
+"@lerna/list@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/list/-/list-5.0.0.tgz#0a979dc9c24ca176c7b4b58de80cab2dac2dcb8a"
+  integrity sha512-+B0yFil2AFdiYO8hyU1bFbKXGBAUUQQ43/fp2XS2jBFCipLme4eTILL5gMKOhr2Xg9AsfYPXRMRer5VW7qTeeQ==
   dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/listable" "4.0.0"
-    "@lerna/output" "4.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/filter-options" "5.0.0"
+    "@lerna/listable" "5.0.0"
+    "@lerna/output" "5.0.0"
 
-"@lerna/listable@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-4.0.0.tgz#d00d6cb4809b403f2b0374fc521a78e318b01214"
-  integrity sha512-/rPOSDKsOHs5/PBLINZOkRIX1joOXUXEtyUs5DHLM8q6/RP668x/1lFhw6Dx7/U+L0+tbkpGtZ1Yt0LewCLgeQ==
+"@lerna/listable@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/listable/-/listable-5.0.0.tgz#c1753d9375932b15c4c84cc767fffb3447b8f213"
+  integrity sha512-Rd5sE7KTbqA8u048qThH5IyBuJIwMcUnEObjFyJyKpc1SEWSumo4yAYmcEeN/9z62tcdud5wHYPSbVgfXJq37g==
   dependencies:
-    "@lerna/query-graph" "4.0.0"
+    "@lerna/query-graph" "5.0.0"
     chalk "^4.1.0"
     columnify "^1.5.4"
 
-"@lerna/log-packed@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-4.0.0.tgz#95168fe2e26ac6a71e42f4be857519b77e57a09f"
-  integrity sha512-+dpCiWbdzgMAtpajLToy9PO713IHoE6GV/aizXycAyA07QlqnkpaBNZ8DW84gHdM1j79TWockGJo9PybVhrrZQ==
+"@lerna/log-packed@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/log-packed/-/log-packed-5.0.0.tgz#afa35bb6a5736038d7dde039e09828ac1c4945a2"
+  integrity sha512-0TxKX+XnlEYj0du9U2kg3HEyIb/0QsM0Slt8utuCxALUnXRHTEKohjqVKsBdvh1QmJpnUbL5I+vfoYqno4Y42w==
   dependencies:
     byte-size "^7.0.0"
     columnify "^1.5.4"
     has-unicode "^2.0.1"
     npmlog "^4.1.2"
 
-"@lerna/npm-conf@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-4.0.0.tgz#b259fd1e1cee2bf5402b236e770140ff9ade7fd2"
-  integrity sha512-uS7H02yQNq3oejgjxAxqq/jhwGEE0W0ntr8vM3EfpCW1F/wZruwQw+7bleJQ9vUBjmdXST//tk8mXzr5+JXCfw==
+"@lerna/npm-conf@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-conf/-/npm-conf-5.0.0.tgz#1364270d231d0df5ac079a9a9733ba0dd7f8c2f9"
+  integrity sha512-KSftxtMNVhLol1JNwFFNgh5jiCG010pewM+uKeSrUe0BCB3lnidiEDzu2CCn8JYYfIXqAiou/pScUiOxVLpcAA==
   dependencies:
     config-chain "^1.1.12"
     pify "^5.0.0"
 
-"@lerna/npm-dist-tag@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-4.0.0.tgz#d1e99b4eccd3414142f0548ad331bf2d53f3257a"
-  integrity sha512-F20sg28FMYTgXqEQihgoqSfwmq+Id3zT23CnOwD+XQMPSy9IzyLf1fFVH319vXIw6NF6Pgs4JZN2Qty6/CQXGw==
+"@lerna/npm-dist-tag@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-dist-tag/-/npm-dist-tag-5.0.0.tgz#becd7fb0bd963357818c8d4fae955cc9f8885cba"
+  integrity sha512-ccUFhp9Wu/FHW5/5fL+vLiSTcUZXtKQ7c0RMXtNRzIdTXBxPBkVi1k5QAnBAAffsz6Owc/K++cb+/zQ/asrG3g==
   dependencies:
-    "@lerna/otplease" "4.0.0"
+    "@lerna/otplease" "5.0.0"
     npm-package-arg "^8.1.0"
     npm-registry-fetch "^9.0.0"
     npmlog "^4.1.2"
 
-"@lerna/npm-install@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-4.0.0.tgz#31180be3ab3b7d1818a1a0c206aec156b7094c78"
-  integrity sha512-aKNxq2j3bCH3eXl3Fmu4D54s/YLL9WSwV8W7X2O25r98wzrO38AUN6AB9EtmAx+LV/SP15et7Yueg9vSaanRWg==
+"@lerna/npm-install@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-install/-/npm-install-5.0.0.tgz#0ee1750bb26eae3c2b4d742d5c1f055e46d534df"
+  integrity sha512-72Jf05JCIdeSBWXAiNjd/y2AQH4Ojgas55ojV2sAcEYz2wgyR7wSpiI6fHBRlRP+3XPjV9MXKxI3ZwOnznQxqQ==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/get-npm-exec-opts" "4.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/get-npm-exec-opts" "5.0.0"
     fs-extra "^9.1.0"
     npm-package-arg "^8.1.0"
     npmlog "^4.1.2"
     signal-exit "^3.0.3"
     write-pkg "^4.0.0"
 
-"@lerna/npm-publish@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-4.0.0.tgz#84eb62e876fe949ae1fd62c60804423dbc2c4472"
-  integrity sha512-vQb7yAPRo5G5r77DRjHITc9piR9gvEKWrmfCH7wkfBnGWEqu7n8/4bFQ7lhnkujvc8RXOsYpvbMQkNfkYibD/w==
+"@lerna/npm-publish@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-publish/-/npm-publish-5.0.0.tgz#a1a06e47e45e56999c85086a40f9b77f801b5a00"
+  integrity sha512-jnapZ2jRajSzshSfd1Y3rHH5R7QC+JJlYST04FBebIH3VePwDT7uAglDCI4um2THvxkW4420EzE4BUMUwKlnXA==
   dependencies:
-    "@lerna/otplease" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
+    "@lerna/otplease" "5.0.0"
+    "@lerna/run-lifecycle" "5.0.0"
     fs-extra "^9.1.0"
     libnpmpublish "^4.0.0"
     npm-package-arg "^8.1.0"
@@ -2270,85 +2273,85 @@
     pify "^5.0.0"
     read-package-json "^3.0.0"
 
-"@lerna/npm-run-script@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-4.0.0.tgz#dfebf4f4601442e7c0b5214f9fb0d96c9350743b"
-  integrity sha512-Jmyh9/IwXJjOXqKfIgtxi0bxi1pUeKe5bD3S81tkcy+kyng/GNj9WSqD5ZggoNP2NP//s4CLDAtUYLdP7CU9rA==
+"@lerna/npm-run-script@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/npm-run-script/-/npm-run-script-5.0.0.tgz#114374b89f228c9719bbfacf9f08d6aac2739fb2"
+  integrity sha512-qgGf0Wc/E2YxPwIiF8kC/OB9ffPf0/HVtPVkqrblVuNE9XVP80WilOH966PIDiXzwXaCo/cTswFoBeseccYRGw==
   dependencies:
-    "@lerna/child-process" "4.0.0"
-    "@lerna/get-npm-exec-opts" "4.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/get-npm-exec-opts" "5.0.0"
     npmlog "^4.1.2"
 
-"@lerna/otplease@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-4.0.0.tgz#84972eb43448f8a1077435ba1c5e59233b725850"
-  integrity sha512-Sgzbqdk1GH4psNiT6hk+BhjOfIr/5KhGBk86CEfHNJTk9BK4aZYyJD4lpDbDdMjIV4g03G7pYoqHzH765T4fxw==
+"@lerna/otplease@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/otplease/-/otplease-5.0.0.tgz#5b0419f64908d7ad840c2735e0284d67cd37095b"
+  integrity sha512-QLLkEy1DPN1XFRAAZDHxAD26MHFQDHfzB6KKSzRYxbHc6lH/YbDaMH1RloSWIm7Hwkxl/3NgpokgN4Lj5XFuzg==
   dependencies:
-    "@lerna/prompt" "4.0.0"
+    "@lerna/prompt" "5.0.0"
 
-"@lerna/output@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-4.0.0.tgz#b1d72215c0e35483e4f3e9994debc82c621851f2"
-  integrity sha512-Un1sHtO1AD7buDQrpnaYTi2EG6sLF+KOPEAMxeUYG5qG3khTs2Zgzq5WE3dt2N/bKh7naESt20JjIW6tBELP0w==
+"@lerna/output@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/output/-/output-5.0.0.tgz#f3712f0cad3e9ef73c803fe368f6a9ac20403868"
+  integrity sha512-/7sUJQWPcvnLudjVIdN7t9MlfBLuP4JCDAWgQMqZe+wpQRuKNyKQ5dLBH5NHU/ElJCjAwMPfWuk3mh3GuvuiGA==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/pack-directory@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-4.0.0.tgz#8b617db95d20792f043aaaa13a9ccc0e04cb4c74"
-  integrity sha512-NJrmZNmBHS+5aM+T8N6FVbaKFScVqKlQFJNY2k7nsJ/uklNKsLLl6VhTQBPwMTbf6Tf7l6bcKzpy7aePuq9UiQ==
+"@lerna/pack-directory@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/pack-directory/-/pack-directory-5.0.0.tgz#f277418545786ca68ca15647bab52ad29bd57f59"
+  integrity sha512-E1SNDS7xSWhJrTSmRzJK7DibneljrymviKcsZW3mRl4TmF4CpYJmNXCMlhEtKEy6ghnGQvnl3/4+eslHDJ5J/w==
   dependencies:
-    "@lerna/get-packed" "4.0.0"
-    "@lerna/package" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
+    "@lerna/get-packed" "5.0.0"
+    "@lerna/package" "5.0.0"
+    "@lerna/run-lifecycle" "5.0.0"
+    "@lerna/temp-write" "5.0.0"
     npm-packlist "^2.1.4"
     npmlog "^4.1.2"
     tar "^6.1.0"
-    temp-write "^4.0.0"
 
-"@lerna/package-graph@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-4.0.0.tgz#16a00253a8ac810f72041481cb46bcee8d8123dd"
-  integrity sha512-QED2ZCTkfXMKFoTGoccwUzjHtZMSf3UKX14A4/kYyBms9xfFsesCZ6SLI5YeySEgcul8iuIWfQFZqRw+Qrjraw==
+"@lerna/package-graph@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package-graph/-/package-graph-5.0.0.tgz#53e88ef46359ef7a2f6e3b7c5bab82302a10653f"
+  integrity sha512-Z3QeUQVjux0Blo64rA3/NivoLDlsQBjsZRIgGLbcQh7l7pJrqLK1WyNCBbPJ0KQNljQqUXthCKzdefnEWe37Ew==
   dependencies:
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/prerelease-id-from-version" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     npm-package-arg "^8.1.0"
     npmlog "^4.1.2"
     semver "^7.3.4"
 
-"@lerna/package@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-4.0.0.tgz#1b4c259c4bcff45c876ee1d591a043aacbc0d6b7"
-  integrity sha512-l0M/izok6FlyyitxiQKr+gZLVFnvxRQdNhzmQ6nRnN9dvBJWn+IxxpM+cLqGACatTnyo9LDzNTOj2Db3+s0s8Q==
+"@lerna/package@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/package/-/package-5.0.0.tgz#4beeb3a1e8eed6e7ae9cebca283c7684278cdd28"
+  integrity sha512-/JiUU88bhbYEUTzPqoGLGwrrdWWTIVMlBb1OPxCGNGDEqYYNySX+OTTSs3zGMcmJnRNI0UyQALiEd0sh3JFN5w==
   dependencies:
     load-json-file "^6.2.0"
     npm-package-arg "^8.1.0"
     write-pkg "^4.0.0"
 
-"@lerna/prerelease-id-from-version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-4.0.0.tgz#c7e0676fcee1950d85630e108eddecdd5b48c916"
-  integrity sha512-GQqguzETdsYRxOSmdFZ6zDBXDErIETWOqomLERRY54f4p+tk4aJjoVdd9xKwehC9TBfIFvlRbL1V9uQGHh1opg==
+"@lerna/prerelease-id-from-version@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.0.0.tgz#3edb90ba9ceace97708d03ff9f650d177f973184"
+  integrity sha512-bUZwyx6evRn2RxogOQXaiYxRK1U/1Mh/KLO4n49wUhqb8S8Vb9aG3+7lLOgg4ZugHpj9KAlD3YGEKvwYQiWzhg==
   dependencies:
     semver "^7.3.4"
 
-"@lerna/profiler@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-4.0.0.tgz#8a53ab874522eae15d178402bff90a14071908e9"
-  integrity sha512-/BaEbqnVh1LgW/+qz8wCuI+obzi5/vRE8nlhjPzdEzdmWmZXuCKyWSEzAyHOJWw1ntwMiww5dZHhFQABuoFz9Q==
+"@lerna/profiler@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/profiler/-/profiler-5.0.0.tgz#e1b74d17dbd6172b5ce9c80426b336bf6ab2e8e9"
+  integrity sha512-hFX+ZtoH7BdDoGI+bqOYaSptJTFI58wNK9qq/pHwL5ksV7vOhxP2cQAuo1SjgBKHGl0Ex/9ZT080YVV4jP1ehw==
   dependencies:
     fs-extra "^9.1.0"
     npmlog "^4.1.2"
     upath "^2.0.1"
 
-"@lerna/project@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-4.0.0.tgz#ff84893935833533a74deff30c0e64ddb7f0ba6b"
-  integrity sha512-o0MlVbDkD5qRPkFKlBZsXZjoNTWPyuL58564nSfZJ6JYNmgAptnWPB2dQlAc7HWRZkmnC2fCkEdoU+jioPavbg==
+"@lerna/project@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/project/-/project-5.0.0.tgz#31672891236696b2a70226388de0300c6086d75f"
+  integrity sha512-+izHk7D/Di2b0s69AzKzAa/qBz32H9s67oN9aKntrjNylpY7iN5opU157l60Kh4TprYHU5bLisqzFLZsHHADGw==
   dependencies:
-    "@lerna/package" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+    "@lerna/package" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     cosmiconfig "^7.0.0"
     dedent "^0.7.0"
     dot-prop "^6.0.1"
@@ -2360,38 +2363,38 @@
     resolve-from "^5.0.0"
     write-json-file "^4.3.0"
 
-"@lerna/prompt@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-4.0.0.tgz#5ec69a803f3f0db0ad9f221dad64664d3daca41b"
-  integrity sha512-4Ig46oCH1TH5M7YyTt53fT6TuaKMgqUUaqdgxvp6HP6jtdak6+amcsqB8YGz2eQnw/sdxunx84DfI9XpoLj4bQ==
+"@lerna/prompt@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/prompt/-/prompt-5.0.0.tgz#31d3d82ecd17e863f8b7cc7944accff4f3de3395"
+  integrity sha512-cq2k04kOPY1yuJNHJn4qfBDDrCi9PF4Q228JICa6bxaONRf/C/TRsEQXHVIdlax8B3l53LnlGv5GECwRuvkQbA==
   dependencies:
     inquirer "^7.3.3"
     npmlog "^4.1.2"
 
-"@lerna/publish@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-4.0.0.tgz#f67011305adeba120066a3b6d984a5bb5fceef65"
-  integrity sha512-K8jpqjHrChH22qtkytA5GRKIVFEtqBF6JWj1I8dWZtHs4Jywn8yB1jQ3BAMLhqmDJjWJtRck0KXhQQKzDK2UPg==
-  dependencies:
-    "@lerna/check-working-tree" "4.0.0"
-    "@lerna/child-process" "4.0.0"
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/describe-ref" "4.0.0"
-    "@lerna/log-packed" "4.0.0"
-    "@lerna/npm-conf" "4.0.0"
-    "@lerna/npm-dist-tag" "4.0.0"
-    "@lerna/npm-publish" "4.0.0"
-    "@lerna/otplease" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/pack-directory" "4.0.0"
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/pulse-till-done" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
-    "@lerna/version" "4.0.0"
+"@lerna/publish@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-5.0.0.tgz#27c4c469e6abd5b52e977568d328632929e859b1"
+  integrity sha512-QEWFtN8fW1M+YXEQOWb2XBBCT137CrwHYK29ojMXW9HShvSZezf8Q/niH91nZ4kIhWdpOGz4w3rKopsumAM5SA==
+  dependencies:
+    "@lerna/check-working-tree" "5.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/collect-updates" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/describe-ref" "5.0.0"
+    "@lerna/log-packed" "5.0.0"
+    "@lerna/npm-conf" "5.0.0"
+    "@lerna/npm-dist-tag" "5.0.0"
+    "@lerna/npm-publish" "5.0.0"
+    "@lerna/otplease" "5.0.0"
+    "@lerna/output" "5.0.0"
+    "@lerna/pack-directory" "5.0.0"
+    "@lerna/prerelease-id-from-version" "5.0.0"
+    "@lerna/prompt" "5.0.0"
+    "@lerna/pulse-till-done" "5.0.0"
+    "@lerna/run-lifecycle" "5.0.0"
+    "@lerna/run-topologically" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
+    "@lerna/version" "5.0.0"
     fs-extra "^9.1.0"
     libnpmaccess "^4.0.1"
     npm-package-arg "^8.1.0"
@@ -2399,126 +2402,138 @@
     npmlog "^4.1.2"
     p-map "^4.0.0"
     p-pipe "^3.1.0"
-    pacote "^11.2.6"
+    pacote "^13.4.1"
     semver "^7.3.4"
 
-"@lerna/pulse-till-done@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-4.0.0.tgz#04bace7d483a8205c187b806bcd8be23d7bb80a3"
-  integrity sha512-Frb4F7QGckaybRhbF7aosLsJ5e9WuH7h0KUkjlzSByVycxY91UZgaEIVjS2oN9wQLrheLMHl6SiFY0/Pvo0Cxg==
+"@lerna/pulse-till-done@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/pulse-till-done/-/pulse-till-done-5.0.0.tgz#df3c32c2d7457362956d997da366f5c060953eef"
+  integrity sha512-qFeVybGIZbQSWKasWIzZmHsvCQMC/AwTz5B44a0zTt5eSNQuI65HRpKKUgmFFu/Jzd7u+yp7eP+NQ53gjOcQlQ==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/query-graph@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-4.0.0.tgz#09dd1c819ac5ee3f38db23931143701f8a6eef63"
-  integrity sha512-YlP6yI3tM4WbBmL9GCmNDoeQyzcyg1e4W96y/PKMZa5GbyUvkS2+Jc2kwPD+5KcXou3wQZxSPzR3Te5OenaDdg==
+"@lerna/query-graph@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/query-graph/-/query-graph-5.0.0.tgz#76c45f648915ef5c884c32c3d35daa3ebb53440b"
+  integrity sha512-C/HXssBI8DVsZ/7IDW6JG9xhoHtWywi3L5oZB9q84MBYpQ9otUv6zbB+K4JCj7w9WHcuFWe2T/mc9wsaFuvB5g==
   dependencies:
-    "@lerna/package-graph" "4.0.0"
+    "@lerna/package-graph" "5.0.0"
 
-"@lerna/resolve-symlink@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-4.0.0.tgz#6d006628a210c9b821964657a9e20a8c9a115e14"
-  integrity sha512-RtX8VEUzqT+uLSCohx8zgmjc6zjyRlh6i/helxtZTMmc4+6O4FS9q5LJas2uGO2wKvBlhcD6siibGt7dIC3xZA==
+"@lerna/resolve-symlink@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/resolve-symlink/-/resolve-symlink-5.0.0.tgz#edff89908e90a390791ab762305d34aa95e7bdbe"
+  integrity sha512-O1EMQh3O3nKjLyI2guCCaxmi9xzZXpiMZhrz2ki5ENEDB2N1+f7cZ2THT0lEOIkLRuADI6hrzoN1obJ+TTk+KQ==
   dependencies:
     fs-extra "^9.1.0"
     npmlog "^4.1.2"
     read-cmd-shim "^2.0.0"
 
-"@lerna/rimraf-dir@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-4.0.0.tgz#2edf3b62d4eb0ef4e44e430f5844667d551ec25a"
-  integrity sha512-QNH9ABWk9mcMJh2/muD9iYWBk1oQd40y6oH+f3wwmVGKYU5YJD//+zMiBI13jxZRtwBx0vmBZzkBkK1dR11cBg==
+"@lerna/rimraf-dir@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/rimraf-dir/-/rimraf-dir-5.0.0.tgz#9e7689610415e6d68c9e766a462c8acfdbf04b9a"
+  integrity sha512-hWJg/13CiSUrWWEek3B/A1mkvBbcPvG5z69/Ugyerdpzlw44ubf02MAZ0/kXPJjkICI2hMrS07YotQ60LdYpCw==
   dependencies:
-    "@lerna/child-process" "4.0.0"
+    "@lerna/child-process" "5.0.0"
     npmlog "^4.1.2"
     path-exists "^4.0.0"
     rimraf "^3.0.2"
 
-"@lerna/run-lifecycle@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-4.0.0.tgz#e648a46f9210a9bcd7c391df6844498cb5079334"
-  integrity sha512-IwxxsajjCQQEJAeAaxF8QdEixfI7eLKNm4GHhXHrgBu185JcwScFZrj9Bs+PFKxwb+gNLR4iI5rpUdY8Y0UdGQ==
+"@lerna/run-lifecycle@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-lifecycle/-/run-lifecycle-5.0.0.tgz#0f62c2faebc19e4ee247bdfa1e05b2a9f51b0637"
+  integrity sha512-36mAm9rC5DSliFShI0Y4ICjgrJXdIIVt7VW9rdbdJ8/XYjRHDzhGPB9Sc1neJOVlGL4DmaArvh5tGgo62KPJYQ==
   dependencies:
-    "@lerna/npm-conf" "4.0.0"
-    npm-lifecycle "^3.1.5"
+    "@lerna/npm-conf" "5.0.0"
+    "@npmcli/run-script" "^3.0.2"
     npmlog "^4.1.2"
 
-"@lerna/run-topologically@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-4.0.0.tgz#af846eeee1a09b0c2be0d1bfb5ef0f7b04bb1827"
-  integrity sha512-EVZw9hGwo+5yp+VL94+NXRYisqgAlj0jWKWtAIynDCpghRxCE5GMO3xrQLmQgqkpUl9ZxQFpICgYv5DW4DksQA==
+"@lerna/run-topologically@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run-topologically/-/run-topologically-5.0.0.tgz#0b0156e3ebe2bf768b9ba1339e02e947e70d1dd1"
+  integrity sha512-B2s1N/+r3sfPOLRA2svNk+C52JpXQleMuGap0yhOx5mZzR1M2Lo4vpe9Ody4hCvXQjfdLx/U342fxVmgugUtfQ==
   dependencies:
-    "@lerna/query-graph" "4.0.0"
+    "@lerna/query-graph" "5.0.0"
     p-queue "^6.6.2"
 
-"@lerna/run@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-4.0.0.tgz#4bc7fda055a729487897c23579694f6183c91262"
-  integrity sha512-9giulCOzlMPzcZS/6Eov6pxE9gNTyaXk0Man+iCIdGJNMrCnW7Dme0Z229WWP/UoxDKg71F2tMsVVGDiRd8fFQ==
-  dependencies:
-    "@lerna/command" "4.0.0"
-    "@lerna/filter-options" "4.0.0"
-    "@lerna/npm-run-script" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/profiler" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/timer" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/run@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/run/-/run-5.0.0.tgz#3af69d1a787866cf85072a0ae9571b9c3bf262e7"
+  integrity sha512-8nBZstqKSO+7wHlKk1g+iexSYRVVNJq/u5ZbAzBiHNrABtqA6/0G7q9vsAEMsnPZ8ARAUYpwvbfKTipjpWH0VA==
+  dependencies:
+    "@lerna/command" "5.0.0"
+    "@lerna/filter-options" "5.0.0"
+    "@lerna/npm-run-script" "5.0.0"
+    "@lerna/output" "5.0.0"
+    "@lerna/profiler" "5.0.0"
+    "@lerna/run-topologically" "5.0.0"
+    "@lerna/timer" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     p-map "^4.0.0"
 
-"@lerna/symlink-binary@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-4.0.0.tgz#21009f62d53a425f136cb4c1a32c6b2a0cc02d47"
-  integrity sha512-zualodWC4q1QQc1pkz969hcFeWXOsVYZC5AWVtAPTDfLl+TwM7eG/O6oP+Rr3fFowspxo6b1TQ6sYfDV6HXNWA==
+"@lerna/symlink-binary@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-binary/-/symlink-binary-5.0.0.tgz#f9da5673ed3a44570fa4d2e691759f82bd7ad057"
+  integrity sha512-uYyiiNjkdL1tWf8MDXIIyCa/a2gmYaUxagqMgEZ4wRtOk+PDypDwMUFVop/EQtUWZqG5CAJBJYOztG3DdapTbA==
   dependencies:
-    "@lerna/create-symlink" "4.0.0"
-    "@lerna/package" "4.0.0"
+    "@lerna/create-symlink" "5.0.0"
+    "@lerna/package" "5.0.0"
     fs-extra "^9.1.0"
     p-map "^4.0.0"
 
-"@lerna/symlink-dependencies@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-4.0.0.tgz#8910eca084ae062642d0490d8972cf2d98e9ebbd"
-  integrity sha512-BABo0MjeUHNAe2FNGty1eantWp8u83BHSeIMPDxNq0MuW2K3CiQRaeWT3EGPAzXpGt0+hVzBrA6+OT0GPn7Yuw==
+"@lerna/symlink-dependencies@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/symlink-dependencies/-/symlink-dependencies-5.0.0.tgz#878b0f52737f82bb7014e13afda8efc606fc071c"
+  integrity sha512-wlZGOOB87XMy278hpF4fOwGNnjTXf1vJ/cFHIdKsJAiDipyhtnuCiJLBDPh4NzEGb02o4rhaqt8Nl5yWRu9CNA==
   dependencies:
-    "@lerna/create-symlink" "4.0.0"
-    "@lerna/resolve-symlink" "4.0.0"
-    "@lerna/symlink-binary" "4.0.0"
+    "@lerna/create-symlink" "5.0.0"
+    "@lerna/resolve-symlink" "5.0.0"
+    "@lerna/symlink-binary" "5.0.0"
     fs-extra "^9.1.0"
     p-map "^4.0.0"
     p-map-series "^2.1.0"
 
-"@lerna/timer@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-4.0.0.tgz#a52e51bfcd39bfd768988049ace7b15c1fd7a6da"
-  integrity sha512-WFsnlaE7SdOvjuyd05oKt8Leg3ENHICnvX3uYKKdByA+S3g+TCz38JsNs7OUZVt+ba63nC2nbXDlUnuT2Xbsfg==
+"@lerna/temp-write@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/temp-write/-/temp-write-5.0.0.tgz#44f8c7c82f498e15db33c166d063be117b819162"
+  integrity sha512-JOkRR6xyASuBy1udyS/VD52Wgywnz7cSKppD+QKIDseNzTq27I9mNmb702BSXNXIdD19lLVQ7q6WoAlpnelnZg==
+  dependencies:
+    graceful-fs "^4.1.15"
+    is-stream "^2.0.0"
+    make-dir "^3.0.0"
+    temp-dir "^1.0.0"
+    uuid "^8.3.2"
 
-"@lerna/validation-error@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-4.0.0.tgz#af9d62fe8304eaa2eb9a6ba1394f9aa807026d35"
-  integrity sha512-1rBOM5/koiVWlRi3V6dB863E1YzJS8v41UtsHgMr6gB2ncJ2LsQtMKlJpi3voqcgh41H8UsPXR58RrrpPpufyw==
+"@lerna/timer@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/timer/-/timer-5.0.0.tgz#ab8fba29f90de21b0eb02406916269122deb2e41"
+  integrity sha512-p2vevkpB6V/b0aR8VyMLDfg0Arp9VvMxcZOEu+IfZ9XKTtnbwjWPHKUOS34x/VGa6bnOIWjE046ixWymOs/fTw==
+
+"@lerna/validation-error@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/validation-error/-/validation-error-5.0.0.tgz#3d3557023e3eb2fd3d8fc9c89f7352a1b6e5bd3e"
+  integrity sha512-fu/MhqRXiRQM2cirP/HoSkfwc5XtJ21G60WHv74RnanKBqWEZAUALWa3MQN2sYhVV/FpDW3GLkO008IW5NWzdg==
   dependencies:
     npmlog "^4.1.2"
 
-"@lerna/version@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-4.0.0.tgz#532659ec6154d8a8789c5ab53878663e244e3228"
-  integrity sha512-otUgiqs5W9zGWJZSCCMRV/2Zm2A9q9JwSDS7s/tlKq4mWCYriWo7+wsHEA/nPTMDyYyBO5oyZDj+3X50KDUzeA==
-  dependencies:
-    "@lerna/check-working-tree" "4.0.0"
-    "@lerna/child-process" "4.0.0"
-    "@lerna/collect-updates" "4.0.0"
-    "@lerna/command" "4.0.0"
-    "@lerna/conventional-commits" "4.0.0"
-    "@lerna/github-client" "4.0.0"
-    "@lerna/gitlab-client" "4.0.0"
-    "@lerna/output" "4.0.0"
-    "@lerna/prerelease-id-from-version" "4.0.0"
-    "@lerna/prompt" "4.0.0"
-    "@lerna/run-lifecycle" "4.0.0"
-    "@lerna/run-topologically" "4.0.0"
-    "@lerna/validation-error" "4.0.0"
+"@lerna/version@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/version/-/version-5.0.0.tgz#36a808e8b4458febd58a6b76852f2ce30e740ca1"
+  integrity sha512-M8KvdyG5kR/d3wgg5S46Q2YMf0L9iw9MiumTvlDP4ckysTt+04kS74Vp4+aClgPM4xaoI5OuMrs6wy5ICcd3Pw==
+  dependencies:
+    "@lerna/check-working-tree" "5.0.0"
+    "@lerna/child-process" "5.0.0"
+    "@lerna/collect-updates" "5.0.0"
+    "@lerna/command" "5.0.0"
+    "@lerna/conventional-commits" "5.0.0"
+    "@lerna/github-client" "5.0.0"
+    "@lerna/gitlab-client" "5.0.0"
+    "@lerna/output" "5.0.0"
+    "@lerna/prerelease-id-from-version" "5.0.0"
+    "@lerna/prompt" "5.0.0"
+    "@lerna/run-lifecycle" "5.0.0"
+    "@lerna/run-topologically" "5.0.0"
+    "@lerna/temp-write" "5.0.0"
+    "@lerna/validation-error" "5.0.0"
     chalk "^4.1.0"
     dedent "^0.7.0"
     load-json-file "^6.2.0"
@@ -2530,13 +2545,12 @@
     p-waterfall "^2.1.1"
     semver "^7.3.4"
     slash "^3.0.0"
-    temp-write "^4.0.0"
     write-json-file "^4.3.0"
 
-"@lerna/write-log-file@4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-4.0.0.tgz#18221a38a6a307d6b0a5844dd592ad53fa27091e"
-  integrity sha512-XRG5BloiArpXRakcnPHmEHJp+4AtnhRtpDIHSghmXD5EichI1uD73J7FgPp30mm2pDRq3FdqB0NbwSEsJ9xFQg==
+"@lerna/write-log-file@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@lerna/write-log-file/-/write-log-file-5.0.0.tgz#ad3d33d6153b962beef48442ab6472233b5d5197"
+  integrity sha512-kpPNxe9xm36QbCWY7DwO96Na6FpCHzZinJtw6ttBHslIcdR38lZuCp+/2KfJcVsRIPNOsp1VvgP7EZIKiBhgjw==
   dependencies:
     npmlog "^4.1.2"
     write-file-atomic "^3.0.3"
@@ -2617,6 +2631,46 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@npmcli/arborist@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-5.2.0.tgz#ee40dfe1f81ae1524819ee39c8f3e7022b0d6269"
+  integrity sha512-zWV7scFGL0SmpvfQyIWnMFbU/0YgtMNyvJiJwR98kyjUSntJGWFFR0O600d5W+TrDcTg0GyDbY+HdzGEg+GXLg==
+  dependencies:
+    "@isaacs/string-locale-compare" "^1.1.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/map-workspaces" "^2.0.3"
+    "@npmcli/metavuln-calculator" "^3.0.1"
+    "@npmcli/move-file" "^2.0.0"
+    "@npmcli/name-from-folder" "^1.0.1"
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/package-json" "^2.0.0"
+    "@npmcli/run-script" "^3.0.0"
+    bin-links "^3.0.0"
+    cacache "^16.0.6"
+    common-ancestor-path "^1.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    json-stringify-nice "^1.1.4"
+    mkdirp "^1.0.4"
+    mkdirp-infer-owner "^2.0.0"
+    nopt "^5.0.0"
+    npm-install-checks "^5.0.0"
+    npm-package-arg "^9.0.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.0"
+    npmlog "^6.0.2"
+    pacote "^13.0.5"
+    parse-conflict-json "^2.0.1"
+    proc-log "^2.0.0"
+    promise-all-reject-late "^1.0.0"
+    promise-call-limit "^1.0.1"
+    read-package-json-fast "^2.0.2"
+    readdir-scoped-modules "^1.1.0"
+    rimraf "^3.0.2"
+    semver "^7.3.7"
+    ssri "^9.0.0"
+    treeverse "^2.0.0"
+    walk-up-path "^1.0.0"
+
 "@npmcli/ci-detect@^1.0.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz#18478bbaa900c37bfbd8a2006a6262c62e8b0fe1"
@@ -2630,21 +2684,30 @@
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/git@^2.1.0":
+"@npmcli/fs@^2.1.0":
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
-  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.0.tgz#f2a21c28386e299d1a9fae8051d35ad180e33109"
+  integrity sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==
   dependencies:
-    "@npmcli/promise-spawn" "^1.3.2"
-    lru-cache "^6.0.0"
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/git@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-3.0.1.tgz#049b99b1381a2ddf7dc56ba3e91eaf76ca803a8d"
+  integrity sha512-UU85F/T+F1oVn3IsB/L6k9zXIMpXBuUBE25QDH0SsURwT6IOBqkC7M16uqo2vVZIyji3X1K4XH9luip7YekH1A==
+  dependencies:
+    "@npmcli/promise-spawn" "^3.0.0"
+    lru-cache "^7.4.4"
     mkdirp "^1.0.4"
-    npm-pick-manifest "^6.1.1"
+    npm-pick-manifest "^7.0.0"
+    proc-log "^2.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
     which "^2.0.2"
 
-"@npmcli/installed-package-contents@^1.0.6":
+"@npmcli/installed-package-contents@^1.0.7":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
   integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
@@ -2652,6 +2715,26 @@
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
+"@npmcli/map-workspaces@^2.0.3":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-2.0.3.tgz#2d3c75119ee53246e9aa75bc469a55281cd5f08f"
+  integrity sha512-X6suAun5QyupNM8iHkNPh0AHdRC2rb1W+MTdMvvA/2ixgmqZwlq5cGUBgmKHUHT2LgrkKJMAXbfAoTxOigpK8Q==
+  dependencies:
+    "@npmcli/name-from-folder" "^1.0.1"
+    glob "^8.0.1"
+    minimatch "^5.0.1"
+    read-package-json-fast "^2.0.3"
+
+"@npmcli/metavuln-calculator@^3.0.1":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.0.tgz#b1c2f0991c4f2d992b1615a54d4358c05efc3702"
+  integrity sha512-Q5fbQqGDlYqk7kWrbg6E2j/mtqQjZop0ZE6735wYA1tYNHguIDjAuWs+kFb5rJCkLIlXllfapvsyotYKiZOTBA==
+  dependencies:
+    cacache "^16.0.0"
+    json-parse-even-better-errors "^2.3.1"
+    pacote "^13.0.3"
+    semver "^7.3.5"
+
 "@npmcli/move-file@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -2660,27 +2743,47 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/node-gyp@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
-  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
+"@npmcli/move-file@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02"
+  integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
 
-"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
-  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+"@npmcli/name-from-folder@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz#77ecd0a4fcb772ba6fe927e2e2e155fbec2e6b1a"
+  integrity sha512-qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA==
+
+"@npmcli/node-gyp@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35"
+  integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A==
+
+"@npmcli/package-json@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-2.0.0.tgz#3bbcf4677e21055adbe673d9f08c9f9cde942e4a"
+  integrity sha512-42jnZ6yl16GzjWSH7vtrmWyJDGVa/LXPdpN2rcUWolFjc9ON2N3uz0qdBbQACfmhuJZ2lbKYtmK5qx68ZPLHMA==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+
+"@npmcli/promise-spawn@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573"
+  integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g==
   dependencies:
     infer-owner "^1.0.4"
 
-"@npmcli/run-script@^1.8.2":
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"
-  integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g==
+"@npmcli/run-script@^3.0.0", "@npmcli/run-script@^3.0.1", "@npmcli/run-script@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-3.0.3.tgz#66afa6e0c4c3484056195f295fa6c1d1a45ddf58"
+  integrity sha512-ZXL6qgC5NjwfZJ2nET+ZSLEz/PJgJ/5CU90C2S66dZY4Jw73DasS4ZCXuy/KHWYP0imjJ4VtA+Gebb5BxxKp9Q==
   dependencies:
-    "@npmcli/node-gyp" "^1.0.2"
-    "@npmcli/promise-spawn" "^1.3.2"
-    node-gyp "^7.1.0"
-    read-package-json-fast "^2.0.1"
+    "@npmcli/node-gyp" "^2.0.0"
+    "@npmcli/promise-spawn" "^3.0.0"
+    node-gyp "^8.4.1"
+    read-package-json-fast "^2.0.3"
 
 "@octokit/auth-token@^2.4.4":
   version "2.5.0"
@@ -3015,89 +3118,89 @@
     "@svgr/plugin-jsx" "^6.2.1"
     "@svgr/plugin-svgo" "^6.2.0"
 
-"@swc/core-android-arm-eabi@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.189.tgz#a8060c2ec7bd93bd9907c3059c44a832eda57b6d"
-  integrity sha512-0kN3Le6QzFFz+Lc6a/tf/RkJXubWwWaHxF4c0bVm4AKIFf4nRlUCEqEkjdVaZvL92rpBMHaEEBuIIz3T8DqTTQ==
-
-"@swc/core-android-arm64@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.189.tgz#c9a7ebaecbef4488db3394e660dd5c2abfa5c173"
-  integrity sha512-smsb+YkDw2OKwg66Z63E/G4NlFApDbsiOPmZXFZbtZbNBD9v+wnk6WVA//XR1bdUI9VbzNKlMPKJxQTE685QDw==
-
-"@swc/core-darwin-arm64@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.189.tgz#883098686504692218e88877b224e06db2a93c86"
-  integrity sha512-OGjZRkTulKirJMLYbW9etb59lA9ueDXVwYRVD9SrNh8tRMTf0Nq+SUT/C3LVhBBGC4KSdWOzBAYbDTTdsnY++Q==
-
-"@swc/core-darwin-x64@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.189.tgz#38ba12dc3b07d96761dc895dd43e14ba3323129f"
-  integrity sha512-BEcxnBHx51514Voe2dn/y1y5H9VNyw7Zpp9+mPekZqx5o/onPD5wZ1ZfAsPrA4UlvM3v16u6ITE/cLawJ/GdAQ==
-
-"@swc/core-freebsd-x64@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.189.tgz#0cee19a1382ee97a7be2ea057cf48f5e08c66038"
-  integrity sha512-B6g2NWeh2iw6WPOaM19Uj3VE4se6alT265kWibLUshjcofRfnYT1lNhhkrF1D0EVnpC8I96I/xXNQo4Am9z4zQ==
-
-"@swc/core-linux-arm-gnueabihf@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.189.tgz#612010e31969387de6acde69d8250fd74f784be1"
-  integrity sha512-6WhPG9pyN5AahQTVQk8MoN1I9Z/Ytfqizuie1wV7mW8FMNmMkiJvBekKtE6ftxu80Hqa34r86WfEwmJKm5MqYw==
-
-"@swc/core-linux-arm64-gnu@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.189.tgz#0fe98d1ca0a3441bfe4033fbe7fc19d87019f640"
-  integrity sha512-frJTGnxsDe7h2d7BtnBivOdOJTtabkQIIZmHd4JHqafcoekI6teyveIax17axLyimvWl278yTo3hf7ePagD/eg==
-
-"@swc/core-linux-arm64-musl@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.189.tgz#bb28e598e028745129e0eb9458184eb5b7efe685"
-  integrity sha512-27K38LoZpME5lojDJIUNo7zdTDwAKLm0BMQ7HXWcYOyiDAekhSidI+SrBWxCfLzfuClhFu6/VE3E7j32VFJsiA==
-
-"@swc/core-linux-x64-gnu@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.189.tgz#365073c3183e40080be900337987fcc4d2270fff"
-  integrity sha512-Ha5oJKOyQm9w7+e+WdRm4ypijzEmglWZGtgBR6vV6ViqqHcTBAU4nG87ex7y7AS9p+Cbc6EOSR9X1qIB8KxtbA==
-
-"@swc/core-linux-x64-musl@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.189.tgz#1ce88e44952d0d4f525016c7841c1443f91de788"
-  integrity sha512-/p5yXa9HEzpVEuE4ivkW1IvwyYu6fT+L2OvVEs5oXIba80F0Wjy7InWqaa83gwrdMH+bXV6loG8LzZUZu/lpjA==
-
-"@swc/core-win32-arm64-msvc@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.189.tgz#2ad4d2aacd0032c1f8a859bba963207436a78769"
-  integrity sha512-o/1ueM6/sifNjYnO6NMEXB895spVfJs5oQIPxQG9vJ/4zWLw8YmAx+u1xJY+XGyK6gnroHt7yPiS87qWdbeF6w==
-
-"@swc/core-win32-ia32-msvc@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.189.tgz#93dee76f59760b8eb516a2e55111fdeaf1e8c6c8"
-  integrity sha512-YDwRkzykaf+dw5Z7u189cC/Tttkn2NVV84hrGL3LbVuh7wT5PaDhZs4Yz4unZQSlPV12olmZWgNr/i27h5wlpg==
-
-"@swc/core-win32-x64-msvc@1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.189.tgz#eeb127740952e3dd5cae2866c2da60346fed457b"
-  integrity sha512-Nge8Z/ZkAp5p5No50yBDpBG7+ZYaVWGSuwtPj6OJe7orzvDCEm9GgcVE6J9GEjbclSWlCH8B8lUe17GaKRZHbg==
-
-"@swc/core@^1.2.189":
-  version "1.2.189"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.189.tgz#8db88e809764e5b3b2be3fcac0da9d9d957e1056"
-  integrity sha512-S5cKX4ECMSfW78DLFgnlilJZgjrFRYwPslrrwpLl3gpwh+Qo72/Mhn71u7G/5xXW+T/xW5GwPccHfCk+k72uUg==
+"@swc/core-android-arm-eabi@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.194.tgz#27a92ac4ce3bb036da95b376ba88f0a364430ab2"
+  integrity sha512-Hv/k9KN2Aab8jO/SmSlzKpzS941IXfdr9XEQRl/rc5Nj4neVW8AWS4+AJnl4u7MiJrfM0No6ZRQx32Ke+APmLQ==
+
+"@swc/core-android-arm64@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.194.tgz#3ac858368ed86894c2b9d288382dc438dacd68f4"
+  integrity sha512-/r2iah0khiv3xUbOT6upf1fdeGdKrVa8sghyTI0jPRpQ5GKD01nuEq+FlmieTwkQ0pQbgVKun0zyriAOXjLqWA==
+
+"@swc/core-darwin-arm64@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.194.tgz#dfd25234bd49a3195c1e2ad5e8ebcc10f9af2de9"
+  integrity sha512-pLsxgi985iSu+wqskJAO+kr0QwNqYQSyfdQEjCtWi5oYp3wIBPHLccIPVcIUfD6YAqXdqnQJg9RtA4scpdrQNg==
+
+"@swc/core-darwin-x64@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.194.tgz#1e60ffcb7b3b959da9aa192c7d6cc9b96e6890b2"
+  integrity sha512-WLFhotRbGqMKg9HwB0RF0Ycz6B6uSMEHcblAdBhiyL4fIp+CMUhkvC8jTs0xij/yJj96B6Xf9UH/Q5MFUQrJEw==
+
+"@swc/core-freebsd-x64@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.194.tgz#31551c68724a942b59122774cf522ebde911ec6e"
+  integrity sha512-UNG8G5TlYWvfyB7+Fc1h5hoSwEY1LLLth7V8DFMljd0dm2hcSpukuWaQk/GE3EANCE40nq3y4THEAlSu4lauSg==
+
+"@swc/core-linux-arm-gnueabihf@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.194.tgz#471d8a3d23d4338969e74dad1889781b0f0e4461"
+  integrity sha512-mbk4MMgBf9BWFV0yqvReT29xZ6N6CLNgiG2UFnmXkLrrEBrAz5c3W8so5VqdyK52yWMS5Vs0a6VOvlimh057KA==
+
+"@swc/core-linux-arm64-gnu@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.194.tgz#49da5e1f92a9566442fc8e9bd67a699f35096049"
+  integrity sha512-vdr2zUJnd67oQfXn1Ix0ueND+iEnCTwA4dobT4s0KsZCusJKuJlkm97p7rgk3Cxn2sHm/8BBQX4KpdXwNEL3Tw==
+
+"@swc/core-linux-arm64-musl@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.194.tgz#29c309bf7ac484baa8ba105e6f6acaaaaede4336"
+  integrity sha512-wocEG55mu/KAFs1B9l1E0FbfU9nKaY3ULuT/isELHqDNZB23nNFRa+ymez/NqBhqVPhX4B0L+7j2r4tipXiI2A==
+
+"@swc/core-linux-x64-gnu@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.194.tgz#6f091d74ef58354410c9bcba7285546579008b54"
+  integrity sha512-PA7kudCtpGy1m40LKTeIsSse0zkmMyHthYjfn7q8pUWlo2b9o9RxO5zsnLxLsgATsoPwfMmVl9m3+1xSkxJp+g==
+
+"@swc/core-linux-x64-musl@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.194.tgz#41c110bb30cd38d1fd61e29698166d59b3fda3aa"
+  integrity sha512-2CdLXLpdKqtZmFgcEOyw9Gu/24ku5/4NabSdYg58XGarrPS96lQk80rzaMYxs6AzfsfhHGmsp3se07jnLwSlXQ==
+
+"@swc/core-win32-arm64-msvc@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.194.tgz#be4eb6826f4665fc67c170b485ec92f01f509c05"
+  integrity sha512-7NpBJ1fgeP8Y2H0aCTZR8nx0BEHXdSuFwBAwKrb4kaP0d2qVAVIv/rOk7L/MwsuXmlsISQ13JnUtQYjYPGJsUg==
+
+"@swc/core-win32-ia32-msvc@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.194.tgz#f5a3311f8368e6299e53e350ee6b41f00f2ebeb0"
+  integrity sha512-1TP+kS32uFSgBHOJGmLNfxcqU7e85FZZTKAVAQgEPmHH0lJ/9BcViMDhMOdnyEWjIluD5aj6WdPdeAz1YlXDng==
+
+"@swc/core-win32-x64-msvc@1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.194.tgz#39cd340c6c2e0e6221f92d64f6c30ca749bcf0cc"
+  integrity sha512-c3tiShCGY03XbJqXpliHRHMBBB/KGWS1kcbKn2GhaZN4fY8UgD5kZk3XJDwDJ6oqwlgkBdWXRAgD5Td2aAKMRg==
+
+"@swc/core@^1.2.194":
+  version "1.2.194"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.194.tgz#698d9ea07fd0b55273e7651e3f95b1c5cf4b61ae"
+  integrity sha512-+Jg3qxad32CqnFmw4pqwm/5JCVWGkoM8P5pqPlyj5sokHFUJluMkCeaikuvIZhJCabR9q84lEnXlIjMu42ZfKA==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.2.189"
-    "@swc/core-android-arm64" "1.2.189"
-    "@swc/core-darwin-arm64" "1.2.189"
-    "@swc/core-darwin-x64" "1.2.189"
-    "@swc/core-freebsd-x64" "1.2.189"
-    "@swc/core-linux-arm-gnueabihf" "1.2.189"
-    "@swc/core-linux-arm64-gnu" "1.2.189"
-    "@swc/core-linux-arm64-musl" "1.2.189"
-    "@swc/core-linux-x64-gnu" "1.2.189"
-    "@swc/core-linux-x64-musl" "1.2.189"
-    "@swc/core-win32-arm64-msvc" "1.2.189"
-    "@swc/core-win32-ia32-msvc" "1.2.189"
-    "@swc/core-win32-x64-msvc" "1.2.189"
+    "@swc/core-android-arm-eabi" "1.2.194"
+    "@swc/core-android-arm64" "1.2.194"
+    "@swc/core-darwin-arm64" "1.2.194"
+    "@swc/core-darwin-x64" "1.2.194"
+    "@swc/core-freebsd-x64" "1.2.194"
+    "@swc/core-linux-arm-gnueabihf" "1.2.194"
+    "@swc/core-linux-arm64-gnu" "1.2.194"
+    "@swc/core-linux-arm64-musl" "1.2.194"
+    "@swc/core-linux-x64-gnu" "1.2.194"
+    "@swc/core-linux-x64-musl" "1.2.194"
+    "@swc/core-win32-arm64-msvc" "1.2.194"
+    "@swc/core-win32-ia32-msvc" "1.2.194"
+    "@swc/core-win32-x64-msvc" "1.2.194"
 
 "@swc/jest@^0.2.21":
   version "0.2.21"
@@ -3567,10 +3670,10 @@
     "@types/webpack" "^4"
     "@types/webpack-dev-server" "3"
 
-"@types/react-dom@^18.0.4":
-  version "18.0.4"
-  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.4.tgz#dcbcadb277bcf6c411ceff70069424c57797d375"
-  integrity sha512-FgTtbqPOCI3dzZPZoC2T/sx3L34qxy99ITWn4eoSA95qPyXDMH0ALoAqUp49ITniiJFsXUVBtalh/KffMpg21Q==
+"@types/react-dom@^18.0.5":
+  version "18.0.5"
+  resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.5.tgz#330b2d472c22f796e5531446939eacef8378444a"
+  integrity sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==
   dependencies:
     "@types/react" "*"
 
@@ -3835,14 +3938,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.25.0.tgz#e8ce050990e4d36cc200f2de71ca0d3eb5e77a31"
-  integrity sha512-icYrFnUzvm+LhW0QeJNKkezBu6tJs9p/53dpPLFH8zoM9w1tfaKzVurkPotEpAqQ8Vf8uaFyL5jHd0Vs6Z0ZQg==
+"@typescript-eslint/eslint-plugin@^5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.26.0.tgz#c1f98ccba9d345e38992975d3ca56ed6260643c2"
+  integrity sha512-oGCmo0PqnRZZndr+KwvvAUvD3kNE4AfyoGCwOZpoCncSh4MVD06JTE8XQa2u9u+NX5CsyZMBTEc2C72zx38eYA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.25.0"
-    "@typescript-eslint/type-utils" "5.25.0"
-    "@typescript-eslint/utils" "5.25.0"
+    "@typescript-eslint/scope-manager" "5.26.0"
+    "@typescript-eslint/type-utils" "5.26.0"
+    "@typescript-eslint/utils" "5.26.0"
     debug "^4.3.4"
     functional-red-black-tree "^1.0.1"
     ignore "^5.2.0"
@@ -3850,69 +3953,69 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.25.0.tgz#fb533487147b4b9efd999a4d2da0b6c263b64f7f"
-  integrity sha512-r3hwrOWYbNKP1nTcIw/aZoH+8bBnh/Lh1iDHoFpyG4DnCpvEdctrSl6LOo19fZbzypjQMHdajolxs6VpYoChgA==
+"@typescript-eslint/parser@^5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.26.0.tgz#a61b14205fe2ab7533deb4d35e604add9a4ceee2"
+  integrity sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.25.0"
-    "@typescript-eslint/types" "5.25.0"
-    "@typescript-eslint/typescript-estree" "5.25.0"
+    "@typescript-eslint/scope-manager" "5.26.0"
+    "@typescript-eslint/types" "5.26.0"
+    "@typescript-eslint/typescript-estree" "5.26.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.25.0.tgz#e78f1484bca7e484c48782075219c82c6b77a09f"
-  integrity sha512-p4SKTFWj+2VpreUZ5xMQsBMDdQ9XdRvODKXN4EksyBjFp2YvQdLkyHqOffakYZPuWJUDNu3jVXtHALDyTv3cww==
+"@typescript-eslint/scope-manager@5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz#44209c7f649d1a120f0717e0e82da856e9871339"
+  integrity sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==
   dependencies:
-    "@typescript-eslint/types" "5.25.0"
-    "@typescript-eslint/visitor-keys" "5.25.0"
+    "@typescript-eslint/types" "5.26.0"
+    "@typescript-eslint/visitor-keys" "5.26.0"
 
-"@typescript-eslint/type-utils@5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.25.0.tgz#5750d26a5db4c4d68d511611e0ada04e56f613bc"
-  integrity sha512-B6nb3GK3Gv1Rsb2pqalebe/RyQoyG/WDy9yhj8EE0Ikds4Xa8RR28nHz+wlt4tMZk5bnAr0f3oC8TuDAd5CPrw==
+"@typescript-eslint/type-utils@5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.26.0.tgz#937dee97702361744a3815c58991acf078230013"
+  integrity sha512-7ccbUVWGLmcRDSA1+ADkDBl5fP87EJt0fnijsMFTVHXKGduYMgienC/i3QwoVhDADUAPoytgjbZbCOMj4TY55A==
   dependencies:
-    "@typescript-eslint/utils" "5.25.0"
+    "@typescript-eslint/utils" "5.26.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.25.0.tgz#dee51b1855788b24a2eceeae54e4adb89b088dd8"
-  integrity sha512-7fWqfxr0KNHj75PFqlGX24gWjdV/FDBABXL5dyvBOWHpACGyveok8Uj4ipPX/1fGU63fBkzSIycEje4XsOxUFA==
+"@typescript-eslint/types@5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.26.0.tgz#cb204bb154d3c103d9cc4d225f311b08219469f3"
+  integrity sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==
 
-"@typescript-eslint/typescript-estree@5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.25.0.tgz#a7ab40d32eb944e3fb5b4e3646e81b1bcdd63e00"
-  integrity sha512-MrPODKDych/oWs/71LCnuO7NyR681HuBly2uLnX3r5i4ME7q/yBqC4hW33kmxtuauLTM0OuBOhhkFaxCCOjEEw==
+"@typescript-eslint/typescript-estree@5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz#16cbceedb0011c2ed4f607255f3ee1e6e43b88c3"
+  integrity sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==
   dependencies:
-    "@typescript-eslint/types" "5.25.0"
-    "@typescript-eslint/visitor-keys" "5.25.0"
+    "@typescript-eslint/types" "5.26.0"
+    "@typescript-eslint/visitor-keys" "5.26.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.25.0", "@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.25.0.tgz#272751fd737733294b4ab95e16c7f2d4a75c2049"
-  integrity sha512-qNC9bhnz/n9Kba3yI6HQgQdBLuxDoMgdjzdhSInZh6NaDnFpTUlwNGxplUFWfY260Ya0TRPvkg9dd57qxrJI9g==
+"@typescript-eslint/utils@5.26.0", "@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.26.0.tgz#896b8480eb124096e99c8b240460bb4298afcfb4"
+  integrity sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.25.0"
-    "@typescript-eslint/types" "5.25.0"
-    "@typescript-eslint/typescript-estree" "5.25.0"
+    "@typescript-eslint/scope-manager" "5.26.0"
+    "@typescript-eslint/types" "5.26.0"
+    "@typescript-eslint/typescript-estree" "5.26.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.25.0":
-  version "5.25.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.25.0.tgz#33aa5fdcc5cedb9f4c8828c6a019d58548d4474b"
-  integrity sha512-yd26vFgMsC4h2dgX4+LR+GeicSKIfUvZREFLf3DDjZPtqgLx5AJZr6TetMNwFP9hcKreTTeztQYBTNbNoOycwA==
+"@typescript-eslint/visitor-keys@5.26.0":
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz#7195f756e367f789c0e83035297c45b417b57f57"
+  integrity sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==
   dependencies:
-    "@typescript-eslint/types" "5.25.0"
+    "@typescript-eslint/types" "5.26.0"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":
@@ -4142,7 +4245,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agentkeepalive@^4.1.3:
+agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
   integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
@@ -4178,7 +4281,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -4301,11 +4404,19 @@ aproba@^1.0.3:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-aproba@^2.0.0:
+"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
+are-we-there-yet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 are-we-there-yet@~1.1.2:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
@@ -4395,11 +4506,6 @@ array-union@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-union@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"
-  integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -4425,17 +4531,6 @@ array.prototype.flatmap@^1.3.0:
     es-abstract "^1.19.2"
     es-shim-unscopables "^1.0.0"
 
-array.prototype.reduce@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f"
-  integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
-    es-array-method-boxes-properly "^1.0.0"
-    is-string "^1.0.7"
-
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -4451,18 +4546,6 @@ asap@^2.0.0, asap@~2.0.3:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
 
-asn1@~0.2.3:
-  version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
-  integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
-  dependencies:
-    safer-buffer "~2.1.0"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
-
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -4517,16 +4600,6 @@ autoprefixer@^10.3.7, autoprefixer@^10.4.7:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
-
-aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-
 axe-core@^4.3.5:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.2.tgz#dcf7fb6dea866166c3eab33d68208afe4d5f670c"
@@ -4587,13 +4660,6 @@ babel-plugin-apply-mdx-type-prop@1.6.22:
     "@babel/helper-plugin-utils" "7.10.4"
     "@mdx-js/util" "1.6.22"
 
-babel-plugin-dynamic-import-node@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
-  integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
@@ -4727,13 +4793,6 @@ batch@0.6.1:
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
   integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
-  dependencies:
-    tweetnacl "^0.14.3"
-
 before-after-hook@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
@@ -4749,6 +4808,18 @@ big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
+bin-links@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-3.0.1.tgz#cc70ffb481988b22c527d3e6e454787876987a49"
+  integrity sha512-9vx+ypzVhASvHTS6K+YSGf7nwQdANoz7v6MTC0aCtYnOEZ87YvMf81aY737EZnGZdpbRM3sfWjO9oWkKmuIvyQ==
+  dependencies:
+    cmd-shim "^5.0.0"
+    mkdirp-infer-owner "^2.0.0"
+    npm-normalize-package-bin "^1.0.0"
+    read-cmd-shim "^3.0.0"
+    rimraf "^3.0.0"
+    write-file-atomic "^4.0.0"
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -4967,10 +5038,12 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
-byline@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
-  integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==
+builtins@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
 
 byte-size@^7.0.0:
   version "7.0.1"
@@ -5011,6 +5084,30 @@ cacache@^15.0.5, cacache@^15.2.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
+cacache@^16.0.0, cacache@^16.0.6, cacache@^16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.0.tgz#87a6bae558a511c9cb2a13768073e240ca76153a"
+  integrity sha512-Pk4aQkwCW82A4jGKFvcGkQFqZcMspfP9YWq9Pr87/ldDvlWf718zeI6KWCdKt/jeihu6BytHRUicJPB1K2k8EQ==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -5095,14 +5192,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001335:
-  version "1.0.30001341"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz#59590c8ffa8b5939cf4161f00827b8873ad72498"
-  integrity sha512-2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA==
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
+  version "1.0.30001344"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz#8a1e7fdc4db9c2ec79a05e9fd68eb93a761888bb"
+  integrity sha512-0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g==
 
 ccount@^1.0.0, ccount@^1.0.3:
   version "1.1.0"
@@ -5402,6 +5494,13 @@ cmd-shim@^4.1.0:
   dependencies:
     mkdirp-infer-owner "^2.0.0"
 
+cmd-shim@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724"
+  integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw==
+  dependencies:
+    mkdirp-infer-owner "^2.0.0"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -5462,6 +5561,11 @@ color-string@^1.9.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
@@ -5493,7 +5597,7 @@ combine-promises@^1.1.0:
   resolved "https://registry.yarnpkg.com/combine-promises/-/combine-promises-1.1.0.tgz#72db90743c0ca7aab7d0d8d2052fd7b0f674de71"
   integrity sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg==
 
-combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
+combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -5556,6 +5660,11 @@ comment-parser@^1.1.2:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
   integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
 
+common-ancestor-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
+  integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
+
 common-tags@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -5659,7 +5768,7 @@ consola@^2.15.3:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
@@ -5795,45 +5904,40 @@ copy-text-to-clipboard@^3.0.1:
   resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c"
   integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==
 
-copy-webpack-plugin@^10.2.4:
-  version "10.2.4"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe"
-  integrity sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==
+copy-webpack-plugin@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a"
+  integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==
   dependencies:
-    fast-glob "^3.2.7"
+    fast-glob "^3.2.11"
     glob-parent "^6.0.1"
-    globby "^12.0.2"
+    globby "^13.1.1"
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
 core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.5.tgz#7fffa1d20cb18405bd22756ca1353c6f1a0e8614"
-  integrity sha512-rEF75n3QtInrYICvJjrAgV03HwKiYvtKHdPtaba1KucG+cNZ4NJnH9isqt979e67KZlhpbCOTwnsvnIr+CVeOg==
+  version "3.22.7"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.7.tgz#8359eb66ecbf726dd0cfced8e48d5e73f3224239"
+  integrity sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA==
   dependencies:
     browserslist "^4.20.3"
     semver "7.0.0"
 
 core-js-pure@^3.20.2:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.5.tgz#bdee0ed2f9b78f2862cda4338a07b13a49b6c9a9"
-  integrity sha512-8xo9R00iYD7TcV7OrC98GwxiUEAabVWO3dix+uyWjnYrx9fyASLlIX+f/3p5dW5qByaP2bcZ8X/T47s55et/tA==
+  version "3.22.7"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.7.tgz#f58489d9b309fa7b26486a0f70d4ec19a418084e"
+  integrity sha512-wTriFxiZI+C8msGeh7fJcbC/a0V8fdInN1oS2eK79DMBGs8iIJiXhtFJCiT3rBa8w6zroHWW3p8ArlujZ/Mz+w==
 
 core-js@^2.4.1:
   version "2.6.12"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
-core-js@^3.22.5:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.5.tgz#a5f5a58e663d5c0ebb4e680cd7be37536fb2a9cf"
-  integrity sha512-VP/xYuvJ0MJWRAobcmQ8F2H6Bsn+s7zqAAjFaHGBMc5AQm7zaelhD1LGduFn2EehEcQcU+br6t+fwbpQ5d1ZWA==
-
-core-util-is@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
+core-js@^3.22.7:
+  version "3.22.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.7.tgz#8d6c37f630f6139b8732d10f2c114c3f1d00024f"
+  integrity sha512-Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg==
 
 core-util-is@^1.0.3, core-util-is@~1.0.0:
   version "1.0.3"
@@ -6000,14 +6104,14 @@ css-loader@^6.7.1:
     postcss-value-parser "^4.2.0"
     semver "^7.3.5"
 
-css-minimizer-webpack-plugin@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f"
-  integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==
+css-minimizer-webpack-plugin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz#e11800388c19c2b7442c39cc78ac8ae3675c9605"
+  integrity sha512-7ZXXRzRHvofv3Uac5Y+RkWRNo0ZMlcg8e9/OtrqUYmwDWJo+qs67GvdeFrXLsFb7czKNwjQhPkM0avlIYl+1nA==
   dependencies:
-    cssnano "^5.0.6"
-    jest-worker "^27.0.2"
-    postcss "^8.3.5"
+    cssnano "^5.1.8"
+    jest-worker "^27.5.1"
+    postcss "^8.4.13"
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
     source-map "^0.6.1"
@@ -6119,7 +6223,7 @@ cssnano-utils@^3.1.0:
   resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
-cssnano@^5.0.6, cssnano@^5.1.9:
+cssnano@^5.1.8, cssnano@^5.1.9:
   version "5.1.9"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.9.tgz#e6cb286c4907cbd55678eb315837a21008be21be"
   integrity sha512-hctQHIIeDrfMjq0bQhoVmRVaSeNNOGxkvkKVOcKpJzLr09wlRrZWH4GaYudp0aszpW8wJeaO5/yBmID9n7DNCg==
@@ -6167,13 +6271,6 @@ dargs@^7.0.0:
   resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
   integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
 
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
-  dependencies:
-    assert-plus "^1.0.0"
-
 data-urls@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
@@ -6325,10 +6422,10 @@ define-property@^2.0.2:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
 
-del@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.1.0.tgz#aa79a5b0a2a9ecc985c0a075e8ad9a5b23bf949c"
-  integrity sha512-OpcRktOt7G7HBfyxP0srBH4Djg4824EQORX8E1qvIhIzthNNArxxhrB/Mm7dRMiLi1nvFyUpDhzD2cTtbBhV8A==
+del@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
+  integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
   dependencies:
     globby "^11.0.1"
     graceful-fs "^4.2.4"
@@ -6633,14 +6730,6 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-ecc-jsbn@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
-  dependencies:
-    jsbn "~0.1.0"
-    safer-buffer "^2.1.0"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -6654,9 +6743,9 @@ ejs@^3.1.6:
     jake "^10.8.5"
 
 electron-to-chromium@^1.4.118:
-  version "1.4.137"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz#186180a45617283f1c012284458510cd99d6787f"
-  integrity sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==
+  version "1.4.140"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.140.tgz#1b5836b7244aff341a11c8efd63dfe003dee4a19"
+  integrity sha512-NLz5va823QfJBYOO/hLV4AfU4Crmkl/6Hl2pH3qdJcmi0ySZ3YTWHxOlDm3uJOFBEPy3pIhu8gKQo6prQTWKKA==
 
 emittery@^0.10.2:
   version "0.10.2"
@@ -6688,7 +6777,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encoding@^0.1.12:
+encoding@^0.1.12, encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -6752,7 +6841,7 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.1:
+es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
   integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
@@ -6781,11 +6870,6 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19
     string.prototype.trimstart "^1.0.5"
     unbox-primitive "^1.0.2"
 
-es-array-method-boxes-properly@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
-  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
-
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
@@ -7243,7 +7327,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.2:
+extend@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -7271,25 +7355,15 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
-
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-equals@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.2.tgz#77f80047b381b6cb747130463ccc144e24c44097"
-  integrity sha512-iY0fAmW7fzxHp22VCRLpOgWbsWsF+DJWi1jhc8w+VGlJUiS+KcGZV2A8t+Q9oTQwhG3L1W8Lu/oe3ZyOPdhZjw==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.3.tgz#8e6cb4e51ca1018d87dd41982ef92758b3e4197f"
+  integrity sha512-NCe8qxnZFARSHGztGMZOO/PC1qa5MIFB5Hp66WdzbCRAz8U8US3bx1UTgLS49efBQPcUtO9gf5oVEY8o7y/7Kg==
 
 fast-folder-size@^1.6.1:
   version "1.6.2"
@@ -7298,7 +7372,7 @@ fast-folder-size@^1.6.1:
   dependencies:
     unzipper "^0.10.11"
 
-fast-glob@^3.2.11, fast-glob@^3.2.7, fast-glob@^3.2.9:
+fast-glob@^3.2.11, fast-glob@^3.2.9:
   version "3.2.11"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
   integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
@@ -7522,9 +7596,9 @@ flatted@^3.1.0:
   integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
 
 flow-parser@0.*:
-  version "0.178.1"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.178.1.tgz#4efe62b3c551c615411bd4a75031c881ff53a7da"
-  integrity sha512-TOvOfZVOhCsKAVU2E4QgFD5vmmF/JWl4bX77H4aYoq8No1mZdtUV8GW6wv03l8N3dmlRqAC5rZcDQ5e8aLDBOg==
+  version "0.179.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.179.0.tgz#595caab8b082b4d424735c97a53216a91c9eb19a"
+  integrity sha512-M4dEgnvsGFa1lUTK05RFW+cwle8tkTHioFm6gGWdeGpDJjjhmvyaN8vLIqb8sAHI05TQxARsnUC3U2chzQP1Dw==
 
 flux@^4.0.1:
   version "4.0.3"
@@ -7540,20 +7614,15 @@ focus-options-polyfill@1.5.1:
   integrity sha512-7yH20IePROHJLLbJvqqtsG420jE6DuukccapiB/WagtUpnc98r9NzHbX5rnjCDgdZqLgcqlzGjn+8l0Zb8Zf9w==
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.14.7:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4"
-  integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
-
 fork-ts-checker-webpack-plugin@^6.5.0:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.2.tgz#4f67183f2f9eb8ba7df7177ce3cf3e75cdafb340"
@@ -7582,15 +7651,6 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@~2.3.2:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
-  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.6"
-    mime-types "^2.1.12"
-
 forwarded@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -7701,6 +7761,20 @@ functions-have-names@^1.2.2:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -7801,13 +7875,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
-  dependencies:
-    assert-plus "^1.0.0"
-
 git-raw-commits@^2.0.8:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723"
@@ -7898,7 +7965,7 @@ glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.3:
+glob@^8.0.1, glob@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
   integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
@@ -7963,15 +8030,14 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.4, globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^12.0.2:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22"
-  integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==
+globby@^13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.1.tgz#7c44a93869b0b7612e38f22ed532bfe37b25ea6f"
+  integrity sha512-XMzoDZbGZ37tufiv7g0N4F/zp3zkwdFtVbV3EHsVl1KQr4RPLfNoT068/97RPshz2J5xYNEjLKKBKaGHifBd3Q==
   dependencies:
-    array-union "^3.0.1"
     dir-glob "^3.0.1"
-    fast-glob "^3.2.7"
-    ignore "^5.1.9"
+    fast-glob "^3.2.11"
+    ignore "^5.2.0"
     merge2 "^1.4.1"
     slash "^4.0.0"
 
@@ -7997,7 +8063,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -8041,19 +8107,6 @@ handlebars@^4.7.7:
   optionalDependencies:
     uglify-js "^3.1.4"
 
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
-
-har-validator@~5.1.3:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
-  integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
-  dependencies:
-    ajv "^6.12.3"
-    har-schema "^2.0.0"
-
 hard-rejection@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
@@ -8330,6 +8383,13 @@ hosted-git-info@^4.0.0, hosted-git-info@^4.0.1:
   dependencies:
     lru-cache "^6.0.0"
 
+hosted-git-info@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.0.0.tgz#df7a06678b4ebd722139786303db80fdf302ea56"
+  integrity sha512-rRnjWu0Bxj+nIfUOkz0695C0H6tRrN5iYIzYejb0tDEefe2AekHu/U5Kn9pEie5vsJqpNQU02az7TGSH3qpz4Q==
+  dependencies:
+    lru-cache "^7.5.1"
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -8508,15 +8568,6 @@ http-proxy@^1.18.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
 https-proxy-agent@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -8578,7 +8629,14 @@ ignore-walk@^3.0.3:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^5.1.9, ignore@^5.2.0:
+ignore-walk@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-5.0.1.tgz#5f199e23e1288f518d90358d461387788a154776"
+  integrity sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==
+  dependencies:
+    minimatch "^5.0.1"
+
+ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -9107,7 +9165,7 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
@@ -9173,11 +9231,6 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
-
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
@@ -9622,7 +9675,7 @@ jest-worker@^26.2.1:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^27.0.2, jest-worker@^27.4.5:
+jest-worker@^27.4.5, jest-worker@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
@@ -9680,11 +9733,6 @@ js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
-
 jscodeshift@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.13.1.tgz#69bfe51e54c831296380585c6d9e733512aecdef"
@@ -9783,7 +9831,7 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
-json-schema@0.4.0, json-schema@^0.4.0:
+json-schema@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
   integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
@@ -9793,7 +9841,12 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
+json-stringify-nice@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67"
+  integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==
+
+json-stringify-safe@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
@@ -9829,16 +9882,6 @@ jsonpointer@^5.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.0.tgz#f802669a524ec4805fa7389eadbc9921d5dc8072"
   integrity sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==
 
-jsprim@^1.2.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb"
-  integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.4.0"
-    verror "1.10.0"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.0.tgz#e624f259143b9062c92b6413ff92a164c80d3ccb"
@@ -9847,6 +9890,16 @@ jsprim@^1.2.2:
     array-includes "^3.1.4"
     object.assign "^4.1.2"
 
+just-diff-apply@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.3.1.tgz#30f40809ffed55ad76dccf73fa9b85a76964c867"
+  integrity sha512-dgFenZnMsc1xGNqgdtgnh7DK+Oy352CE3VZLbzcbQpsBs9iI2K3M0IRrdgREZ72eItTjbl0suRyvKRdVQa9GbA==
+
+just-diff@^5.0.1:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.0.2.tgz#68854c94280c37d28cb266d8f29bdd2cd29f003e"
+  integrity sha512-uGd6F+eIZ4T95EinP8ubINGkbEy3jrgBym+6LjW+ja1UG1WQIcEcQ6FLeyXtVJZglk+bj7fvEn+Cu2LBxkgiYQ==
+
 katex@^0.15.0:
   version "0.15.6"
   resolved "https://registry.yarnpkg.com/katex/-/katex-0.15.6.tgz#c4e2f6ced2ac4de1ef6f737fe7c67d3026baa0e5"
@@ -9938,27 +9991,27 @@ lerna-changelog@^2.2.0:
     progress "^2.0.0"
     yargs "^17.1.0"
 
-lerna@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/lerna/-/lerna-4.0.0.tgz#b139d685d50ea0ca1be87713a7c2f44a5b678e9e"
-  integrity sha512-DD/i1znurfOmNJb0OBw66NmNqiM8kF6uIrzrJ0wGE3VNdzeOhz9ziWLYiRaZDGGwgbcjOo6eIfcx9O5Qynz+kg==
-  dependencies:
-    "@lerna/add" "4.0.0"
-    "@lerna/bootstrap" "4.0.0"
-    "@lerna/changed" "4.0.0"
-    "@lerna/clean" "4.0.0"
-    "@lerna/cli" "4.0.0"
-    "@lerna/create" "4.0.0"
-    "@lerna/diff" "4.0.0"
-    "@lerna/exec" "4.0.0"
-    "@lerna/import" "4.0.0"
-    "@lerna/info" "4.0.0"
-    "@lerna/init" "4.0.0"
-    "@lerna/link" "4.0.0"
-    "@lerna/list" "4.0.0"
-    "@lerna/publish" "4.0.0"
-    "@lerna/run" "4.0.0"
-    "@lerna/version" "4.0.0"
+lerna@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/lerna/-/lerna-5.0.0.tgz#077e35d41fcead5ea223af1862dc25475e1aaf2a"
+  integrity sha512-dUYmJ7H9k/xHtwKpQWLTNUa1jnFUiW4o4K2LFkRchlIijoIUT4yK/RprIxNvYCrLrEaOdZryvY5UZvSHI2tBxA==
+  dependencies:
+    "@lerna/add" "5.0.0"
+    "@lerna/bootstrap" "5.0.0"
+    "@lerna/changed" "5.0.0"
+    "@lerna/clean" "5.0.0"
+    "@lerna/cli" "5.0.0"
+    "@lerna/create" "5.0.0"
+    "@lerna/diff" "5.0.0"
+    "@lerna/exec" "5.0.0"
+    "@lerna/import" "5.0.0"
+    "@lerna/info" "5.0.0"
+    "@lerna/init" "5.0.0"
+    "@lerna/link" "5.0.0"
+    "@lerna/list" "5.0.0"
+    "@lerna/publish" "5.0.0"
+    "@lerna/run" "5.0.0"
+    "@lerna/version" "5.0.0"
     import-local "^3.0.2"
     npmlog "^4.1.2"
 
@@ -10019,10 +10072,10 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-lint-staged@^12.4.1:
-  version "12.4.1"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.4.1.tgz#63fa27bfc8a33515f6902f63f6670864f1fb233c"
-  integrity sha512-PTXgzpflrQ+pODQTG116QNB+Q6uUTDg5B5HqGvNhoQSGt8Qy+MA/6zSnR8n38+sxP5TapzeQGTvoKni0KRS8Vg==
+lint-staged@^12.4.2:
+  version "12.4.2"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-12.4.2.tgz#380a5ec5a7a23caa9420972b0f98c8192afddecd"
+  integrity sha512-JAJGIzY/OioIUtrRePr8go6qUxij//mL+RGGoFKU3VWQRtIHgWoHizSqH0QVn2OwrbXS9Q6CICQjfj+E5qvrXg==
   dependencies:
     cli-truncate "^3.1.0"
     colorette "^2.0.16"
@@ -10298,6 +10351,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.10.1.tgz#db577f42a94c168f676b638d15da8fb073448cab"
+  integrity sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==
+
 magic-string@^0.25.0, magic-string@^0.25.1, magic-string@^0.25.2, magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
@@ -10320,6 +10378,28 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
+make-fetch-happen@^10.0.6:
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.1.5.tgz#d975c0a4373de41ea05236d8182f56333511c268"
+  integrity sha512-mucOj2H0Jn/ax7H9K9T1bf0p1nn/mBFa551Os7ed9xRfLEx20aZhZeLslmRYfAaAqXZUGipcs+m5KOKvOH0XKA==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^16.1.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^2.0.3"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^6.1.1"
+    ssri "^9.0.0"
+
 make-fetch-happen@^8.0.9:
   version "8.0.14"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
@@ -10341,7 +10421,7 @@ make-fetch-happen@^8.0.9:
     socks-proxy-agent "^5.0.0"
     ssri "^8.0.0"
 
-make-fetch-happen@^9.0.0, make-fetch-happen@^9.0.1:
+make-fetch-happen@^9.0.0, make-fetch-happen@^9.0.1, make-fetch-happen@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
   integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
@@ -10575,7 +10655,7 @@ mime-types@2.1.18:
   dependencies:
     mime-db "~1.33.0"
 
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -10680,6 +10760,17 @@ minipass-fetch@^1.3.0, minipass-fetch@^1.3.2:
   optionalDependencies:
     encoding "^0.1.12"
 
+minipass-fetch@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8"
+  integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==
+  dependencies:
+    minipass "^3.1.6"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
@@ -10717,7 +10808,7 @@ minipass@^2.6.0, minipass@^2.9.0:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
+minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
   integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
@@ -10731,7 +10822,7 @@ minizlib@^1.3.3:
   dependencies:
     minipass "^2.9.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1:
+minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -10761,7 +10852,7 @@ mkdirp-infer-owner@^2.0.0:
     infer-owner "^1.0.4"
     mkdirp "^1.0.3"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@^0.5.5:
+"mkdirp@>=0.5 0", mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -10863,7 +10954,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-negotiator@0.6.3, negotiator@^0.6.2:
+negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
@@ -10902,16 +10993,16 @@ no-case@^3.0.4:
     tslib "^2.0.3"
 
 node-abi@^3.3.0:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.15.0.tgz#cd9ac8c58328129b49998cc6fa16aa5506152716"
-  integrity sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==
+  version "3.22.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.22.0.tgz#00b8250e86a0816576258227edbce7bbe0039362"
+  integrity sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==
   dependencies:
     semver "^7.3.5"
 
-node-addon-api@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
-  integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
+node-addon-api@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501"
+  integrity sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==
 
 node-dir@^0.1.17:
   version "0.1.17"
@@ -10939,37 +11030,20 @@ node-forge@^1:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
-node-gyp@^5.0.2:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-5.1.1.tgz#eb915f7b631c937d282e33aed44cb7a025f62a3e"
-  integrity sha512-WH0WKGi+a4i4DUt2mHnvocex/xPLp9pYt5R6M2JdFB7pJ7Z34hveZ4nDTGTiLXCkitA9T8HFZjhinBCiVHYcWw==
+node-gyp@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.2"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.1.2"
-    request "^2.88.0"
-    rimraf "^2.6.3"
-    semver "^5.7.1"
-    tar "^4.4.12"
-    which "^1.3.1"
-
-node-gyp@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
-  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.3"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^9.1.0"
     nopt "^5.0.0"
-    npmlog "^4.1.2"
-    request "^2.88.2"
+    npmlog "^6.0.0"
     rimraf "^3.0.2"
-    semver "^7.3.2"
-    tar "^6.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -10978,17 +11052,9 @@ node-int64@^0.4.0:
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
 node-releases@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
-  integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
-
-nopt@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
-  integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666"
+  integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==
 
 nopt@^5.0.0:
   version "5.0.0"
@@ -10997,7 +11063,7 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -11017,6 +11083,16 @@ normalize-package-data@^3.0.0, normalize-package-data@^3.0.2:
     semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.0.tgz#1122d5359af21d4cd08718b92b058a658594177c"
+  integrity sha512-m+GL22VXJKkKbw62ZaBBjv8u6IE3UI4Mh5QakIqs3fWiKe0Xyi6L97hakwZK41/LD4R/2ly71Bayx0NLMwLA/g==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -11037,40 +11113,26 @@ normalize-url@^6.0.1, normalize-url@^6.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-bundled@^1.1.1:
+npm-bundled@^1.1.1, npm-bundled@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
   integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
-npm-install-checks@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
-  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+npm-install-checks@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-5.0.0.tgz#5ff27d209a4e3542b8ac6b0c1db6063506248234"
+  integrity sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==
   dependencies:
     semver "^7.1.1"
 
-npm-lifecycle@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-3.1.5.tgz#9882d3642b8c82c815782a12e6a1bfeed0026309"
-  integrity sha512-lDLVkjfZmvmfvpvBzA4vzee9cn+Me4orq0QF8glbswJVEbIcSNWib7qGOffolysc3teCqbbPZZkzbr3GQZTL1g==
-  dependencies:
-    byline "^5.0.0"
-    graceful-fs "^4.1.15"
-    node-gyp "^5.0.2"
-    resolve-from "^4.0.0"
-    slide "^1.1.6"
-    uid-number "0.0.6"
-    umask "^1.1.0"
-    which "^1.3.1"
-
 npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
   integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
 
-npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
+npm-package-arg@^8.0.0, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
   version "8.1.5"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
   integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
@@ -11079,6 +11141,15 @@ npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-pack
     semver "^7.3.4"
     validate-npm-package-name "^3.0.0"
 
+npm-package-arg@^9.0.0, npm-package-arg@^9.0.1:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.0.2.tgz#f3ef7b1b3b02e82564af2d5228b4c36567dcd389"
+  integrity sha512-v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g==
+  dependencies:
+    hosted-git-info "^5.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^4.0.0"
+
 npm-packlist@^2.1.4:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8"
@@ -11089,15 +11160,25 @@ npm-packlist@^2.1.4:
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
-  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+npm-packlist@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.0.tgz#f3fd52903a021009913a133732022132eb355ce7"
+  integrity sha512-a04sqF6FbkyOAFA19AA0e94gS7Et5T2/IMj3VOT9nOF2RaRdVPQ1Q17Fb/HaDRFs+gbC7HOmhVZ29adpWgmDZg==
   dependencies:
-    npm-install-checks "^4.0.0"
+    glob "^8.0.1"
+    ignore-walk "^5.0.1"
+    npm-bundled "^1.1.2"
     npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^8.1.2"
-    semver "^7.3.4"
+
+npm-pick-manifest@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-7.0.1.tgz#76dda30a7cd6b99be822217a935c2f5eacdaca4c"
+  integrity sha512-IA8+tuv8KujbsbLQvselW2XQgmXWS47t3CB0ZrzsRZ82DbDfkcFunOaPm4X7qNuhMfq+FmV7hQT4iFVpHqV7mg==
+  dependencies:
+    npm-install-checks "^5.0.0"
+    npm-normalize-package-bin "^1.0.1"
+    npm-package-arg "^9.0.0"
+    semver "^7.3.5"
 
 npm-registry-fetch@^11.0.0:
   version "11.0.0"
@@ -11111,6 +11192,19 @@ npm-registry-fetch@^11.0.0:
     minizlib "^2.0.0"
     npm-package-arg "^8.0.0"
 
+npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.1.1.tgz#26dc4b26d0a545886e807748032ba2aefaaae96b"
+  integrity sha512-5p8rwe6wQPLJ8dMqeTnA57Dp9Ox6GH9H60xkyJup07FmVlu3Mk7pf/kIIpl9gaN5bM8NM+UUx3emUWvDNTt39w==
+  dependencies:
+    make-fetch-happen "^10.0.6"
+    minipass "^3.1.6"
+    minipass-fetch "^2.0.3"
+    minipass-json-stream "^1.0.1"
+    minizlib "^2.1.2"
+    npm-package-arg "^9.0.1"
+    proc-log "^2.0.0"
+
 npm-registry-fetch@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz#86f3feb4ce00313bc0b8f1f8f69daae6face1661"
@@ -11162,15 +11256,25 @@ npmlog@^4.0.1, npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+npmlog@^6.0.0, npmlog@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
+
 nprogress@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
   integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==
 
 nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
@@ -11191,11 +11295,6 @@ nwsapi@^2.2.0:
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
-oauth-sign@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
-  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
-
 object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -11211,9 +11310,9 @@ object-copy@^0.1.0:
     kind-of "^3.0.3"
 
 object-inspect@^1.12.0, object-inspect@^1.9.0:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.1.tgz#28a661153bad7e470e4b01479ef1cb91ce511191"
-  integrity sha512-Y/jF6vnvEtOPGiKD1+q+X0CiUYRQtEHp89MLLUJ7TUivtH8Ugn2+3A7Rynqk7BRsAoqeOQWnFnjpDrKSxDgIGA==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
 object-keys@^1.1.1:
   version "1.1.1"
@@ -11255,16 +11354,6 @@ object.fromentries@^2.0.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37"
-  integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==
-  dependencies:
-    array.prototype.reduce "^1.0.4"
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.1"
-
 object.hasown@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3"
@@ -11358,24 +11447,16 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
 p-cancelable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
@@ -11514,30 +11595,32 @@ package-json@^6.3.0:
     registry-url "^5.0.0"
     semver "^6.2.0"
 
-pacote@^11.2.6:
-  version "11.3.5"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.5.tgz#73cf1fc3772b533f575e39efa96c50be8c3dc9d2"
-  integrity sha512-fT375Yczn4zi+6Hkk2TBe1x1sP8FgFsEIZ2/iWaXY2r/NkhDJfxbcn5paz1+RTFCyNf+dPnaoBDJoAxXSU8Bkg==
+pacote@^13.0.3, pacote@^13.0.5, pacote@^13.4.1:
+  version "13.5.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-13.5.0.tgz#e2c745dc320513a98b9403e92b366a1ba6a4db94"
+  integrity sha512-yekp0ykEsaBH0t0bYA/89R+ywdYV5ZnEdg4YMIfqakSlpIhoF6b8+aEUm8NZpfWRgmy6lxgywcW05URhLRogVQ==
   dependencies:
-    "@npmcli/git" "^2.1.0"
-    "@npmcli/installed-package-contents" "^1.0.6"
-    "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^1.8.2"
-    cacache "^15.0.5"
+    "@npmcli/git" "^3.0.0"
+    "@npmcli/installed-package-contents" "^1.0.7"
+    "@npmcli/promise-spawn" "^3.0.0"
+    "@npmcli/run-script" "^3.0.1"
+    cacache "^16.0.0"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
     infer-owner "^1.0.4"
-    minipass "^3.1.3"
-    mkdirp "^1.0.3"
-    npm-package-arg "^8.0.1"
-    npm-packlist "^2.1.4"
-    npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^11.0.0"
+    minipass "^3.1.6"
+    mkdirp "^1.0.4"
+    npm-package-arg "^9.0.0"
+    npm-packlist "^5.1.0"
+    npm-pick-manifest "^7.0.0"
+    npm-registry-fetch "^13.0.1"
+    proc-log "^2.0.0"
     promise-retry "^2.0.1"
-    read-package-json-fast "^2.0.1"
+    read-package-json "^5.0.0"
+    read-package-json-fast "^2.0.3"
     rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.1.0"
+    ssri "^9.0.0"
+    tar "^6.1.11"
 
 param-case@^3.0.4:
   version "3.0.4"
@@ -11561,6 +11644,15 @@ parent-module@^2.0.0:
   dependencies:
     callsites "^3.1.0"
 
+parse-conflict-json@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-2.0.2.tgz#3d05bc8ffe07d39600dc6436c6aefe382033d323"
+  integrity sha512-jDbRGb00TAPFsKWCpZZOT93SxVP9nONOSgES3AevqRq/CHvavEBvKAjxX9p5Y5F0RZLxH9Ufd9+RwtCsa+lFDA==
+  dependencies:
+    json-parse-even-better-errors "^2.3.1"
+    just-diff "^5.0.1"
+    just-diff-apply "^5.2.0"
+
 parse-entities@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
@@ -11735,11 +11827,6 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
-
 picocolors@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
@@ -11877,14 +11964,14 @@ postcss-js@^2.0.3:
     camelcase-css "^2.0.1"
     postcss "^7.0.18"
 
-postcss-loader@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef"
-  integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==
+postcss-loader@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.0.tgz#367d10eb1c5f1d93700e6b399683a6dc7c3af396"
+  integrity sha512-IDyttebFzTSY6DI24KuHUcBjbAev1i+RyICoPEWcAstZsj03r533uMXtDn506l6/wlsRYiS5XBdx7TpccCsyUg==
   dependencies:
     cosmiconfig "^7.0.0"
     klona "^2.0.5"
-    semver "^7.3.5"
+    semver "^7.3.7"
 
 postcss-media-query-parser@^0.2.3:
   version "0.2.3"
@@ -12128,7 +12215,7 @@ postcss@^7.0.18, postcss@^7.0.39:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.2.x, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.7:
+postcss@^8.2.x, postcss@^8.3.11, postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.7:
   version "8.4.14"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf"
   integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==
@@ -12137,7 +12224,7 @@ postcss@^8.2.x, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.13, postcss@^8.4.1
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-prebuild-install@^7.0.1:
+prebuild-install@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.0.tgz#991b6ac16c81591ba40a6d5de93fb33673ac1370"
   integrity sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==
@@ -12223,6 +12310,11 @@ prismjs@^1.28.0:
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6"
   integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==
 
+proc-log@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -12233,6 +12325,16 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
+promise-all-reject-late@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2"
+  integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==
+
+promise-call-limit@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.1.tgz#4bdee03aeb85674385ca934da7114e9bcd3c6e24"
+  integrity sha512-3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q==
+
 promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
@@ -12307,7 +12409,7 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
@@ -12354,11 +12456,6 @@ qs@6.10.3, qs@^6.9.4:
   dependencies:
     side-channel "^1.0.4"
 
-qs@~6.5.2:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
-  integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
-
 query-string@^6.13.8:
   version "6.14.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz#7ac2dca46da7f309449ba0f86b1fd28255b0c86a"
@@ -12568,10 +12665,10 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1:
   dependencies:
     "@babel/runtime" "^7.10.3"
 
-react-medium-image-zoom@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-4.4.0.tgz#aa9f63dc08ffc2c2c919f16f3918f13951998a41"
-  integrity sha512-Y+1enQKyeM/ASAmvlKkLw0USbHePP5dbdjNSclHDBvzGLD8+tUqgxjjtTS54tMvvll7OSxTThVaXxrvO0uYO6A==
+react-medium-image-zoom@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/react-medium-image-zoom/-/react-medium-image-zoom-4.4.3.tgz#d5e3074becef7be4bfe35ebcd291eac462093bf5"
+  integrity sha512-I928Z6mEMRUup4CPa+XtASiSuFzdVb1ecztXpF7xAJddXv4XZSE4n5gleZNYCn5wEU1LQY5LiN4aNW4KgrOVIA==
   dependencies:
     focus-options-polyfill "1.5.1"
     tslib "^2.4.0"
@@ -12675,7 +12772,12 @@ read-cmd-shim@^2.0.0:
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz#4a50a71d6f0965364938e9038476f7eede3928d9"
   integrity sha512-HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw==
 
-read-package-json-fast@^2.0.1:
+read-cmd-shim@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz#62b8c638225c61e6cc607f8f4b779f3b8238f155"
+  integrity sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog==
+
+read-package-json-fast@^2.0.2, read-package-json-fast@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
   integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
@@ -12683,16 +12785,6 @@ read-package-json-fast@^2.0.1:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
 
-read-package-json@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz#6992b2b66c7177259feb8eaac73c3acd28b9222a"
-  integrity sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==
-  dependencies:
-    glob "^7.1.1"
-    json-parse-even-better-errors "^2.3.0"
-    normalize-package-data "^2.0.0"
-    npm-normalize-package-bin "^1.0.0"
-
 read-package-json@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-3.0.1.tgz#c7108f0b9390257b08c21e3004d2404c806744b9"
@@ -12713,14 +12805,15 @@ read-package-json@^4.1.1:
     normalize-package-data "^3.0.0"
     npm-normalize-package-bin "^1.0.0"
 
-read-package-tree@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"
-  integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==
+read-package-json@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26"
+  integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg==
   dependencies:
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    util-promisify "^2.1.0"
+    glob "^8.0.1"
+    json-parse-even-better-errors "^2.3.1"
+    normalize-package-data "^4.0.0"
+    npm-normalize-package-bin "^1.0.1"
 
 read-pkg-up@^3.0.0:
   version "3.0.0"
@@ -12765,7 +12858,7 @@ read@1, read@~1.0.1:
   dependencies:
     mute-stream "~0.0.4"
 
-readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
+readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -12787,7 +12880,7 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readdir-scoped-modules@^1.0.0:
+readdir-scoped-modules@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309"
   integrity sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==
@@ -13146,32 +13239,6 @@ repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1:
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
-request@^2.88.0, request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -13288,7 +13355,7 @@ rfdc@^1.3.0:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@2, rimraf@^2.6.3:
+rimraf@2:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -13320,9 +13387,9 @@ rollup-plugin-terser@^7.0.0:
     terser "^5.0.0"
 
 rollup@^2.43.1:
-  version "2.74.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.74.1.tgz#4fba0ff1c312cc4ee82691b154eee69a0d01929f"
-  integrity sha512-K2zW7kV8Voua5eGkbnBtWYfMIhYhT9Pel2uhBk2WO5eMee161nPze/XRfvEQPFYz7KgrCCnmh2Wy0AMFLGGmMA==
+  version "2.75.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.75.0.tgz#c4c1c2bf46c706823f5f0eee046c7a1cbdda5038"
+  integrity sha512-1/wxtweHJ7YwI2AIK3ZgCBU3nbW8sLnBIFwN46cwOTnVzt8f1o6J8zPKjwoiuADvzSjmnLqJce31p0q2vQ+dqw==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -13384,7 +13451,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -13482,7 +13549,7 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -13497,7 +13564,7 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -13574,7 +13641,7 @@ serve-static@1.15.0:
     parseurl "~1.3.3"
     send "0.18.0"
 
-set-blocking@~2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
@@ -13616,15 +13683,15 @@ shallowequal@^1.1.0:
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
-sharp@^0.30.4:
-  version "0.30.4"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.4.tgz#73d9daa63bbc20da189c9328d75d5d395fc8fb73"
-  integrity sha512-3Onig53Y6lji4NIZo69s14mERXXY/GV++6CzOYx/Rd8bnTwbhFbL09WZd7Ag/CCnA0WxFID8tkY0QReyfL6v0Q==
+sharp@^0.30.5:
+  version "0.30.5"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.30.5.tgz#81c36fd05624978384ac6bd2744d23f9c82edefd"
+  integrity sha512-0T28KxqY4DzUMLSAp1/IhGVeHpPIQyp1xt7esmuXCAfyi/+6tYMUeRhQok+E/+E52Yk5yFjacXp90cQOkmkl4w==
   dependencies:
     color "^4.2.3"
     detect-libc "^2.0.1"
-    node-addon-api "^4.3.0"
-    prebuild-install "^7.0.1"
+    node-addon-api "^5.0.0"
+    prebuild-install "^7.1.0"
     semver "^7.3.7"
     simple-get "^4.0.1"
     tar-fs "^2.1.1"
@@ -13763,11 +13830,6 @@ slice-ansi@^5.0.0:
     ansi-styles "^6.0.0"
     is-fullwidth-code-point "^4.0.0"
 
-slide@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha512-NwrtjCg+lZoqhFU8fOwl4ay2ei8PaqCBOUV3/ektPY9trO1yQ1oXEfmHAhKArUVUr/hOHvy5f6AdP17dCM0zMw==
-
 smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
@@ -13821,7 +13883,7 @@ socks-proxy-agent@^5.0.0:
     debug "4"
     socks "^2.3.3"
 
-socks-proxy-agent@^6.0.0:
+socks-proxy-agent@^6.0.0, socks-proxy-agent@^6.1.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
   integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
@@ -14021,21 +14083,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    bcrypt-pbkdf "^1.0.0"
-    dashdash "^1.12.0"
-    ecc-jsbn "~0.1.1"
-    getpass "^0.1.1"
-    jsbn "~0.1.0"
-    safer-buffer "^2.0.2"
-    tweetnacl "~0.14.0"
-
 ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
@@ -14043,6 +14090,13 @@ ssri@^8.0.0, ssri@^8.0.1:
   dependencies:
     minipass "^3.1.1"
 
+ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
+
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -14310,10 +14364,10 @@ stylelint-config-standard@^25.0.0:
   dependencies:
     stylelint-config-recommended "^7.0.0"
 
-stylelint@^14.8.3:
-  version "14.8.3"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.3.tgz#25d2df1e010cda52ff56327059d1ce25319109be"
-  integrity sha512-aLpskXwSgFEBYbFRKA/BfuyYMGuXNtn2t5GqoffNPSezvw97x/vVNWcZNF0+cwt+LBjfvyq9/MRE3OjInGRgNA==
+stylelint@^14.8.3, stylelint@^14.8.5:
+  version "14.8.5"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.5.tgz#0fcbf5b6821283b5a249dde36d70f1158da0a2a3"
+  integrity sha512-e3t4H/hlWlspkcNUrkhf44RU3OpPTA7uBOoREGBzSwdEF+2g/+gbZq7WEpMP7BpopcSe/uLaTvDuL+URL7cdnQ==
   dependencies:
     balanced-match "^2.0.0"
     colord "^2.9.2"
@@ -14339,7 +14393,7 @@ stylelint@^14.8.3:
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.4.13"
+    postcss "^8.4.14"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-safe-parser "^6.0.0"
@@ -14470,7 +14524,7 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^4.4.12, tar@^4.4.8:
+tar@^4.4.8:
   version "4.4.19"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3"
   integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==
@@ -14483,7 +14537,7 @@ tar@^4.4.12, tar@^4.4.8:
     safe-buffer "^5.2.1"
     yallist "^3.1.1"
 
-tar@^6.0.2, tar@^6.1.0:
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -14505,17 +14559,6 @@ temp-dir@^2.0.0:
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e"
   integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==
 
-temp-write@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/temp-write/-/temp-write-4.0.0.tgz#cd2e0825fc826ae72d201dc26eef3bf7e6fc9320"
-  integrity sha512-HIeWmj77uOOHb0QX7siN3OtwV3CTntquin6TNVg6SHOqCP3hYKmox90eeFOGaY1MqJ9WYDDjkyZrW6qS5AWpbw==
-  dependencies:
-    graceful-fs "^4.1.15"
-    is-stream "^2.0.0"
-    make-dir "^3.0.0"
-    temp-dir "^1.0.0"
-    uuid "^3.3.2"
-
 temp@^0.8.4:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.4.tgz#8c97a33a4770072e0a05f919396c7665a7dd59f2"
@@ -14735,14 +14778,6 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -14783,6 +14818,11 @@ tree-node-cli@^1.5.2:
     fast-folder-size "^1.6.1"
     pretty-bytes "^5.6.0"
 
+treeverse@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-2.0.0.tgz#036dcef04bc3fd79a9b79a68d4da03e882d8a9ca"
+  integrity sha512-N5gJCkLu1aXccpOTtqV6ddSEi6ZmGkh3hjmbu1IjcavJK4qyOVQmi0myQKM7z5jVGmD68SJoliaVrMmVObhj6A==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -14842,11 +14882,6 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -14902,9 +14937,9 @@ type-fest@^0.8.1:
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
 type-fest@^2.5.0:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.12.2.tgz#80a53614e6b9b475eb9077472fb7498dc7aa51d0"
-  integrity sha512-qt6ylCGpLjZ7AaODxbpyBZSs9fCI9SkL3Z9q2oxMBQhs/uyY+VD8jHA8ULCGmWQJlBgqvO3EJeAngOHD8zQCrQ==
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.13.0.tgz#d1ecee38af29eb2e863b22299a3d68ef30d2abfb"
+  integrity sha512-lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw==
 
 type-is@~1.6.18:
   version "1.6.18"
@@ -14927,6 +14962,11 @@ typedarray@^0.0.6:
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 typescript@^4.6.4:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4"
+  integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==
+
+typescript@~4.6.4:
   version "4.6.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
   integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
@@ -14941,16 +14981,6 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.15.5.tgz#2b10f9e0bfb3f5c15a8e8404393b6361eaeb33b3"
   integrity sha512-hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ==
 
-uid-number@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-  integrity sha512-c461FXIljswCuscZn67xq9PpszkPT6RjheWFQTgCyabJrTUozElanb0YEqv2UGgk247YpcJkFBuSGNvBlpXM9w==
-
-umask@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
-  integrity sha512-lE/rxOhmiScJu9L6RTNVgB/zZbF+vGC0/p6D3xnkAePI2o0sMyFG966iR5Ki50OI/0mNi2yaRnxfLsPmEZF/JA==
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -15317,13 +15347,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util-promisify@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz#3c2236476c4d32c5ff3c47002add7c13b9a82a53"
-  integrity sha512-K+5eQPYs14b3+E+hmE2J6gCZ4JmMl9DbYS6BeP2CHq6WMuNxErxf5B/n0fz85L8zUuoO6rIzNNmIQDu/j+1OcA==
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-
 utila@~0.4:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
@@ -15339,11 +15362,6 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-uuid@^3.3.2:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
-  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
-
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -15378,6 +15396,13 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
+validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
+  dependencies:
+    builtins "^5.0.0"
+
 value-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
@@ -15388,15 +15413,6 @@ vary@~1.1.2:
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
 vfile-location@^3.0.0, vfile-location@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
@@ -15486,6 +15502,11 @@ wait-on@^6.0.1:
     minimist "^1.2.5"
     rxjs "^7.5.4"
 
+walk-up-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e"
+  integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg==
+
 walker@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
@@ -15766,7 +15787,7 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+wide-align@^1.1.0, wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -16011,7 +16032,7 @@ write-file-atomic@^3.0.0, write-file-atomic@^3.0.3:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write-file-atomic@^4.0.1:
+write-file-atomic@^4.0.0, write-file-atomic@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
   integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
@@ -16053,14 +16074,14 @@ write-pkg@^4.0.0:
     write-json-file "^3.2.0"
 
 ws@^7.3.1:
-  version "7.5.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.8.tgz#ac2729881ab9e7cbaf8787fe3469a48c5c7f636a"
+  integrity sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==
 
 ws@^8.2.3, ws@^8.4.2:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.7.0.tgz#eaf9d874b433aa00c0e0d8752532444875db3957"
+  integrity sha512-c2gsP0PRwcLFzUiA8Mkr37/MI7ilIlHQxaEAtd0uNMbVMoy8puJyafRlm0bV9MbGSabUPeLrRRaqIBcFcA2Pqg==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"

From 7ab97d472676e49d57ad49e30c180744c185b0a3 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Fri, 27 May 2022 22:30:59 +0800
Subject: [PATCH 25/43] feat(sitemap): allow customizing the output name
 (#7469)

* feat(sitemap): allow customizing the output name

* add docs
---
 packages/docusaurus-plugin-sitemap/src/index.ts   | 2 +-
 packages/docusaurus-plugin-sitemap/src/options.ts | 7 +++++++
 website/docs/api/plugins/plugin-sitemap.md        | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-plugin-sitemap/src/index.ts b/packages/docusaurus-plugin-sitemap/src/index.ts
index 9d9f75a442c5..3044f1feff8b 100644
--- a/packages/docusaurus-plugin-sitemap/src/index.ts
+++ b/packages/docusaurus-plugin-sitemap/src/index.ts
@@ -32,7 +32,7 @@ export default function pluginSitemap(
       );
 
       // Write sitemap file.
-      const sitemapPath = path.join(outDir, 'sitemap.xml');
+      const sitemapPath = path.join(outDir, options.filename);
       try {
         await fs.outputFile(sitemapPath, generatedSitemap);
       } catch (err) {
diff --git a/packages/docusaurus-plugin-sitemap/src/options.ts b/packages/docusaurus-plugin-sitemap/src/options.ts
index 365f60156eaf..9cc1fe1b8cc1 100644
--- a/packages/docusaurus-plugin-sitemap/src/options.ts
+++ b/packages/docusaurus-plugin-sitemap/src/options.ts
@@ -19,6 +19,11 @@ export type PluginOptions = {
    * sitemap. Note that you may need to include the base URL in here.
    */
   ignorePatterns: string[];
+  /**
+   * The path to the created sitemap file, relative to the output directory.
+   * Useful if you have two plugin instances outputting two files.
+   */
+  filename: string;
 };
 
 export type Options = Partial<PluginOptions>;
@@ -27,6 +32,7 @@ export const DEFAULT_OPTIONS: PluginOptions = {
   changefreq: EnumChangefreq.WEEKLY,
   priority: 0.5,
   ignorePatterns: [],
+  filename: 'sitemap.xml',
 };
 
 const PluginOptionSchema = Joi.object<PluginOptions>({
@@ -46,6 +52,7 @@ const PluginOptionSchema = Joi.object<PluginOptions>({
     'any.unknown':
       'Please use the new Docusaurus global trailingSlash config instead, and the sitemaps plugin will use it.',
   }),
+  filename: Joi.string().default(DEFAULT_OPTIONS.filename),
 });
 
 export function validateOptions({
diff --git a/website/docs/api/plugins/plugin-sitemap.md b/website/docs/api/plugins/plugin-sitemap.md
index 0d37d2345151..145b62d9e258 100644
--- a/website/docs/api/plugins/plugin-sitemap.md
+++ b/website/docs/api/plugins/plugin-sitemap.md
@@ -40,6 +40,7 @@ Accepted fields:
 | `changefreq` | `string` | `'weekly'` | See [sitemap docs](https://www.sitemaps.org/protocol.html#xmlTagDefinitions) |
 | `priority` | `number` | `0.5` | See [sitemap docs](https://www.sitemaps.org/protocol.html#xmlTagDefinitions) |
 | `ignorePatterns` | `string[]` | `[]` | A list of glob patterns; matching route paths will be filtered from the sitemap. Note that you may need to include the base URL in here. |
+| `filename` | `string` | `sitemap.xml` | The path to the created sitemap file, relative to the output directory. Useful if you have two plugin instances outputting two files. |
 
 </APITable>
 
@@ -70,6 +71,7 @@ const config = {
   changefreq: 'weekly',
   priority: 0.5,
   ignorePatterns: ['/tags/**'],
+  filename: 'sitemap.xml',
 };
 ```
 

From 49ecd8f472a35b54e3d6f4079d3bbd1101a496f4 Mon Sep 17 00:00:00 2001
From: Ori Shalom <ori-shalom@users.noreply.github.com>
Date: Fri, 27 May 2022 17:48:29 +0300
Subject: [PATCH 26/43] fix(gtag): send the newly rendered page's title instead
 of the old one's (#7424)

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
Co-authored-by: sebastienlorber <lorber.sebastien@gmail.com>
---
 .../docusaurus-plugin-google-gtag/src/gtag.ts | 27 ++++++++++++-------
 website/_dogfooding/clientModuleExample.ts    | 14 +++++++---
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/packages/docusaurus-plugin-google-gtag/src/gtag.ts b/packages/docusaurus-plugin-google-gtag/src/gtag.ts
index dab90146d1fc..2122511126a8 100644
--- a/packages/docusaurus-plugin-google-gtag/src/gtag.ts
+++ b/packages/docusaurus-plugin-google-gtag/src/gtag.ts
@@ -15,16 +15,23 @@ const {trackingID} = globalData['docusaurus-plugin-google-gtag']!
 const clientModule: ClientModule = {
   onRouteDidUpdate({location, previousLocation}) {
     if (previousLocation && location.pathname !== previousLocation.pathname) {
-      // Always refer to the variable on window in case it gets overridden
-      // elsewhere.
-      window.gtag('config', trackingID, {
-        page_path: location.pathname,
-        page_title: document.title,
-      });
-      window.gtag('event', 'page_view', {
-        page_title: document.title,
-        page_location: window.location.href,
-        page_path: location.pathname,
+      // Normally, the document title is updated in the next tick due to how
+      // `react-helmet-async` updates it. We want to send the current document's
+      // title to gtag instead of the old one's, so we use `setTimeout` to defer
+      // execution to the next tick.
+      // See: https://github.com/facebook/docusaurus/issues/7420
+      setTimeout(() => {
+        // Always refer to the variable on window in case it gets overridden
+        // elsewhere.
+        window.gtag('config', trackingID, {
+          page_path: location.pathname,
+          page_title: document.title,
+        });
+        window.gtag('event', 'page_view', {
+          page_title: document.title,
+          page_location: window.location.href,
+          page_path: location.pathname,
+        });
       });
     }
   },
diff --git a/website/_dogfooding/clientModuleExample.ts b/website/_dogfooding/clientModuleExample.ts
index 01b2d8250631..cd61e5a99e81 100644
--- a/website/_dogfooding/clientModuleExample.ts
+++ b/website/_dogfooding/clientModuleExample.ts
@@ -13,10 +13,16 @@ function logPage(
   location: Location,
   previousLocation: Location | null,
 ): void {
-  console.log(`${event}
-Previous location: ${previousLocation?.pathname}
-Current location: ${location.pathname}
-Current heading: ${document.getElementsByTagName('h1')[0]?.innerText}`);
+  console.log(event, location.pathname, {
+    location,
+    prevLocation: previousLocation,
+    heading: document.getElementsByTagName('h1')[0]?.innerText,
+    title: document.title,
+    description: (
+      document.querySelector('meta[name="description"]') as HTMLMetaElement
+    )?.content,
+    htmlClassName: document.getElementsByTagName('html')[0]?.className,
+  });
 }
 
 export function onRouteUpdate({

From 1e18f8fd4ec23b35980369506593e6341b48594a Mon Sep 17 00:00:00 2001
From: Charles Korn <charleskorn@users.noreply.github.com>
Date: Sat, 28 May 2022 01:55:35 +1000
Subject: [PATCH 27/43] fix: always emit SEO title + og:title meta (#7362)

Co-authored-by: sebastienlorber <lorber.sebastien@gmail.com>
---
 packages/docusaurus/src/client/SiteMetadataDefaults.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/docusaurus/src/client/SiteMetadataDefaults.tsx b/packages/docusaurus/src/client/SiteMetadataDefaults.tsx
index bd2f953aab3e..e3ba631fbbe5 100644
--- a/packages/docusaurus/src/client/SiteMetadataDefaults.tsx
+++ b/packages/docusaurus/src/client/SiteMetadataDefaults.tsx
@@ -12,15 +12,17 @@ import useBaseUrl from '@docusaurus/useBaseUrl';
 
 export default function SiteMetadataDefaults(): JSX.Element {
   const {
-    siteConfig: {favicon, tagline, title},
+    siteConfig: {favicon, title},
     i18n: {currentLocale, localeConfigs},
   } = useDocusaurusContext();
   const faviconUrl = useBaseUrl(favicon);
   const {htmlLang, direction: htmlDir} = localeConfigs[currentLocale]!;
 
   return (
-    <Head defaultTitle={`${title}${tagline ? ` · ${tagline}` : ''}`}>
+    <Head>
       <html lang={htmlLang} dir={htmlDir} />
+      <title>{title}</title>
+      <meta property="og:title" content={title} />
       {favicon && <link rel="icon" href={faviconUrl} />}
     </Head>
   );

From 613d938cfc8b56611e99a6a2cb2d9bfca15fcb09 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 18:29:11 +0200
Subject: [PATCH 28/43] chore: prepare v2.0.0-beta.21 release (#7513)

* add beta 21 version

* v2.0.0-beta.21

* typo
---
 CHANGELOG.md                                  | 110 ++++++++++++++++++
 admin/new.docusaurus.io/package.json          |   2 +-
 lerna.json                                    |   2 +-
 packages/create-docusaurus/package.json       |   6 +-
 .../templates/classic-typescript/package.json |   8 +-
 .../templates/classic/package.json            |   8 +-
 .../templates/facebook/package.json           |   6 +-
 .../docusaurus-cssnano-preset/package.json    |   2 +-
 packages/docusaurus-logger/package.json       |   2 +-
 packages/docusaurus-mdx-loader/package.json   |   8 +-
 packages/docusaurus-migrate/package.json      |   6 +-
 .../package.json                              |   4 +-
 .../package.json                              |  14 +--
 .../package.json                              |  16 +--
 .../package.json                              |  16 +--
 .../package.json                              |  12 +-
 packages/docusaurus-plugin-debug/package.json |   8 +-
 .../package.json                              |   8 +-
 .../package.json                              |   8 +-
 .../package.json                              |  14 +--
 packages/docusaurus-plugin-pwa/package.json   |  14 +--
 .../docusaurus-plugin-sitemap/package.json    |  14 +--
 .../docusaurus-preset-classic/package.json    |  24 ++--
 .../package.json                              |   2 +-
 .../docusaurus-theme-classic/package.json     |  24 ++--
 packages/docusaurus-theme-common/package.json |  14 +--
 .../package.json                              |  12 +-
 .../package.json                              |  18 +--
 .../package.json                              |   6 +-
 packages/docusaurus-types/package.json        |   2 +-
 packages/docusaurus-utils-common/package.json |   4 +-
 .../docusaurus-utils-validation/package.json  |   6 +-
 packages/docusaurus-utils/package.json        |   6 +-
 packages/docusaurus/package.json              |  18 +--
 packages/eslint-plugin/package.json           |   2 +-
 packages/lqip-loader/package.json             |   4 +-
 packages/stylelint-copyright/package.json     |   2 +-
 website/package.json                          |  28 ++---
 .../advanced/architecture.md                  |   0
 .../advanced/client.md                        |   0
 .../advanced/index.md                         |   0
 .../advanced/plugins.md                       |   0
 .../advanced/routing.md                       |   0
 .../advanced/ssg.md                           |   0
 .../api/docusaurus.config.js.md               |   4 +-
 .../api/misc/_category_.yml                   |   0
 .../api/misc/create-docusaurus.md             |  57 +++++++++
 .../api/misc/eslint-plugin/README.md          |   2 +-
 .../eslint-plugin/no-untranslated-text.md     |   0
 .../string-literal-i18n-messages.md           |   0
 .../api/misc/logger/demo.png}                 | Bin
 .../api/misc/logger}/logger.md                |   6 +-
 .../api/plugin-methods/README.md              |   0
 .../api/plugin-methods/_category_.yml         |   0
 .../plugin-methods/extend-infrastructure.md   |   0
 .../api/plugin-methods/i18n-lifecycles.md     |   0
 .../api/plugin-methods/lifecycle-apis.md      |   0
 .../api/plugin-methods/static-methods.md      |   0
 .../api/plugins/_category_.yml                |   0
 .../api/plugins/overview.md                   |   0
 .../api/plugins/plugin-client-redirects.md    |  12 +-
 .../api/plugins/plugin-content-blog.md        |  24 +++-
 .../api/plugins/plugin-content-docs.md        |  52 ++++++---
 .../api/plugins/plugin-content-pages.md       |   0
 .../api/plugins/plugin-debug.md               |   0
 .../api/plugins/plugin-google-analytics.md    |   0
 .../api/plugins/plugin-google-gtag.md         |   0
 .../api/plugins/plugin-ideal-image.md         |   0
 .../api/plugins/plugin-pwa.md                 |  37 +++---
 .../api/plugins/plugin-sitemap.md             |   2 +
 .../api/themes/_category_.yml                 |   0
 .../api/themes/overview.md                    |   0
 .../api/themes/theme-classic.md               |   0
 .../api/themes/theme-configuration.md         |   1 +
 .../api/themes/theme-live-codeblock.md        |   0
 .../api/themes/theme-search-algolia.md        |   0
 .../docusaurus-asset-example-banner.png       | Bin
 .../assets/docusaurus-asset-example.docx      | Bin
 .../assets/docusaurus-asset-example.xyz       | Bin
 .../blog.mdx                                  |   0
 .../browser-support.md                        |   0
 .../cli.md                                    |   2 +
 .../configuration.md                          |   0
 .../deployment.mdx                            |   4 +
 .../docusaurus-core.md                        |   8 +-
 .../guides/creating-pages.md                  |   0
 .../guides/docs/docs-create-doc.mdx           |   0
 .../guides/docs/docs-introduction.md          |   0
 .../guides/docs/docs-multi-instance.mdx       |   0
 .../guides/docs/sidebar/autogenerated.md      |   0
 .../guides/docs/sidebar/index.md              |   0
 .../guides/docs/sidebar/items.md              |   0
 .../guides/docs/sidebar/multiple-sidebars.md  |   0
 .../guides/docs/versioning.md                 |   2 +-
 .../_markdown-partial-example.mdx             |   0
 .../markdown-features-admonitions.mdx         |   0
 .../markdown-features-assets.mdx              |   0
 .../markdown-features-code-blocks.mdx         |   0
 .../markdown-features-head-metadata.mdx       |   0
 .../markdown-features-intro.mdx               |   0
 .../markdown-features-links.md                |   0
 .../markdown-features-math-equations.mdx      |   0
 .../markdown-features-plugins.mdx             |   0
 .../markdown-features-react.mdx               |  70 ++++++++++-
 .../markdown-features-react.module.css        |   0
 .../markdown-features-tabs-styles.module.css  |   0
 .../markdown-features-tabs.mdx                |   0
 .../markdown-features-toc.mdx                 |   4 +-
 .../guides/whats-next.md                      |   0
 .../i18n/i18n-crowdin.mdx                     |   0
 .../i18n/i18n-git.md                          |   0
 .../i18n/i18n-introduction.md                 |   0
 .../i18n/i18n-tutorial.md                     |   0
 .../installation.md                           |  25 +---
 .../introduction.md                           |  16 ++-
 .../migration/migration-automated.md          |   0
 .../migration/migration-manual.md             |   0
 .../migration/migration-overview.md           |   0
 .../migration/migration-translated-sites.md   |   0
 .../migration/migration-versioned-sites.md    |   0
 .../playground.mdx                            |   0
 .../search.md                                 |   0
 .../seo.md                                    |   0
 .../static-assets.md                          |   0
 .../styling-layout.md                         |   0
 .../swizzling.md                              |   0
 .../typescript-support.md                     |   0
 .../using-plugins.md                          |   0
 ...on => version-2.0.0-beta.21-sidebars.json} |   0
 website/versions.json                         |   5 +-
 website/versionsArchived.json                 |   1 +
 131 files changed, 530 insertions(+), 264 deletions(-)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/advanced/architecture.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/advanced/client.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/advanced/index.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/advanced/plugins.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/advanced/routing.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/advanced/ssg.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/docusaurus.config.js.md (99%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/misc/_category_.yml (100%)
 create mode 100644 website/versioned_docs/version-2.0.0-beta.21/api/misc/create-docusaurus.md
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/misc/eslint-plugin/README.md (98%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/misc/eslint-plugin/no-untranslated-text.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/misc/eslint-plugin/string-literal-i18n-messages.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19/api/misc/img/logger-demo.png => version-2.0.0-beta.21/api/misc/logger/demo.png} (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19/api/misc => version-2.0.0-beta.21/api/misc/logger}/logger.md (97%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugin-methods/README.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugin-methods/_category_.yml (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugin-methods/extend-infrastructure.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugin-methods/i18n-lifecycles.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugin-methods/lifecycle-apis.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugin-methods/static-methods.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/_category_.yml (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/overview.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-client-redirects.md (87%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-content-blog.md (92%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-content-docs.md (90%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-content-pages.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-debug.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-google-analytics.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-google-gtag.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-ideal-image.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-pwa.md (91%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/plugins/plugin-sitemap.md (90%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/themes/_category_.yml (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/themes/overview.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/themes/theme-classic.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/themes/theme-configuration.md (99%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/themes/theme-live-codeblock.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/api/themes/theme-search-algolia.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/assets/docusaurus-asset-example-banner.png (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/assets/docusaurus-asset-example.docx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/assets/docusaurus-asset-example.xyz (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/blog.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/browser-support.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/cli.md (97%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/configuration.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/deployment.mdx (97%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/docusaurus-core.md (97%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/creating-pages.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/docs-create-doc.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/docs-introduction.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/docs-multi-instance.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/sidebar/autogenerated.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/sidebar/index.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/sidebar/items.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/sidebar/multiple-sidebars.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/docs/versioning.md (98%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/_markdown-partial-example.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-admonitions.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-assets.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-code-blocks.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-head-metadata.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-intro.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-links.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-math-equations.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-plugins.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-react.mdx (80%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-react.module.css (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-tabs-styles.module.css (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-tabs.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/markdown-features/markdown-features-toc.mdx (99%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/guides/whats-next.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/i18n/i18n-crowdin.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/i18n/i18n-git.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/i18n/i18n-introduction.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/i18n/i18n-tutorial.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/installation.md (89%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/introduction.md (98%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/migration/migration-automated.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/migration/migration-manual.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/migration/migration-overview.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/migration/migration-translated-sites.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/migration/migration-versioned-sites.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/playground.mdx (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/search.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/seo.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/static-assets.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/styling-layout.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/swizzling.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/typescript-support.md (100%)
 rename website/versioned_docs/{version-2.0.0-beta.19 => version-2.0.0-beta.21}/using-plugins.md (100%)
 rename website/versioned_sidebars/{version-2.0.0-beta.19-sidebars.json => version-2.0.0-beta.21-sidebars.json} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb3245d49f70..22ab4e6fa124 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,115 @@
 # Docusaurus 2 Changelog
 
+## 2.0.0-beta.21 (2022-05-27)
+
+#### :boom: Breaking Change
+
+- `docusaurus-plugin-pwa`
+  - [#7422](https://github.com/facebook/docusaurus/pull/7422) refactor(pwa): remove reloadPopup option in favor of swizzling ([@Josh-Cena](https://github.com/Josh-Cena))
+- `create-docusaurus`, `docusaurus-cssnano-preset`, `docusaurus-logger`, `docusaurus-mdx-loader`, `docusaurus-migrate`, `docusaurus-plugin-client-redirects`, `docusaurus-plugin-content-blog`, `docusaurus-plugin-content-docs`, `docusaurus-plugin-content-pages`, `docusaurus-plugin-debug`, `docusaurus-plugin-google-analytics`, `docusaurus-plugin-google-gtag`, `docusaurus-plugin-ideal-image`, `docusaurus-plugin-pwa`, `docusaurus-plugin-sitemap`, `docusaurus-preset-classic`, `docusaurus-remark-plugin-npm2yarn`, `docusaurus-theme-classic`, `docusaurus-theme-common`, `docusaurus-theme-live-codeblock`, `docusaurus-theme-search-algolia`, `docusaurus-theme-translations`, `docusaurus-utils-common`, `docusaurus-utils-validation`, `docusaurus-utils`, `docusaurus`, `eslint-plugin`, `lqip-loader`
+  - [#7501](https://github.com/facebook/docusaurus/pull/7501) chore: require Node 16.14 ([@Josh-Cena](https://github.com/Josh-Cena))
+
+#### :rocket: New Feature
+
+- `docusaurus-plugin-sitemap`
+  - [#7469](https://github.com/facebook/docusaurus/pull/7469) feat(sitemap): allow customizing the output name ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-utils`, `docusaurus`
+  - [#7371](https://github.com/facebook/docusaurus/pull/7371) feat(core): support docusaurus.config.cjs as default file name ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus`
+  - [#7500](https://github.com/facebook/docusaurus/pull/7500) feat: make docusaurus serve automatically open in browser ([@Zamiell](https://github.com/Zamiell))
+  - [#7452](https://github.com/facebook/docusaurus/pull/7452) feat: add --no-minify flag to docusaurus start ([@lanegoolsby](https://github.com/lanegoolsby))
+- `docusaurus-theme-classic`
+  - [#7357](https://github.com/facebook/docusaurus/pull/7357) feat(theme-classic): allow className as option for type: "search" ([@JPeer264](https://github.com/JPeer264))
+
+#### :bug: Bug Fix
+
+- `docusaurus`
+  - [#7362](https://github.com/facebook/docusaurus/pull/7362) fix: always emit SEO title + og:title meta ([@charleskorn](https://github.com/charleskorn))
+  - [#7453](https://github.com/facebook/docusaurus/pull/7453) fix(core): avoid using logger and fs.readJSON in SSR ([@Josh-Cena](https://github.com/Josh-Cena))
+  - [#7369](https://github.com/facebook/docusaurus/pull/7369) fix(cli): output correct path when swizzling bare-file component in subfolder ([@Josh-Cena](https://github.com/Josh-Cena))
+  - [#7360](https://github.com/facebook/docusaurus/pull/7360) fix(core): allow githubPort in config validation ([@mhughes2k](https://github.com/mhughes2k))
+- `docusaurus-plugin-google-gtag`
+  - [#7424](https://github.com/facebook/docusaurus/pull/7424) fix(gtag): send the newly rendered page's title instead of the old one's ([@ori-shalom](https://github.com/ori-shalom))
+- `create-docusaurus`, `docusaurus-utils`
+  - [#7507](https://github.com/facebook/docusaurus/pull/7507) fix(create-docusaurus): potential security issue with command injection ([@slorber](https://github.com/slorber))
+- `docusaurus-module-type-aliases`, `docusaurus-theme-classic`, `docusaurus`
+  - [#7492](https://github.com/facebook/docusaurus/pull/7492) fix(core): always treat error boundary fallback as a callback ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-theme-classic`
+  - [#7438](https://github.com/facebook/docusaurus/pull/7438) fix(theme-classic): allow nested task lists to preserve the indent ([@Josh-Cena](https://github.com/Josh-Cena))
+  - [#7430](https://github.com/facebook/docusaurus/pull/7430) fix(theme-classic): consistently apply the right active class name for all navbar items ([@Josh-Cena](https://github.com/Josh-Cena))
+  - [#7411](https://github.com/facebook/docusaurus/pull/7411) fix(theme-classic): autocollapse sidebar categories when navigating with paginator ([@pranabdas](https://github.com/pranabdas))
+  - [#7363](https://github.com/facebook/docusaurus/pull/7363) fix(theme-classic): resolve customCss from site dir ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-utils`
+  - [#7464](https://github.com/facebook/docusaurus/pull/7464) fix(utils): fix Markdown link replacement when link text is same as href ([@Josh-Cena](https://github.com/Josh-Cena))
+  - [#7458](https://github.com/facebook/docusaurus/pull/7458) fix(utils): avoid replacing Markdown links missing the directly next link ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-mdx-loader`
+  - [#7392](https://github.com/facebook/docusaurus/pull/7392) fix(mdx-loader): use React.Fragment as fragment factory ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-plugin-content-docs`
+  - [#7385](https://github.com/facebook/docusaurus/pull/7385) fix(content-docs): restore functionality when a category only has index page ([@Josh-Cena](https://github.com/Josh-Cena))
+
+#### :nail_care: Polish
+
+- `docusaurus-theme-translations`
+  - [#7493](https://github.com/facebook/docusaurus/pull/7493) chore(theme-translations): complete French translations ([@forresst](https://github.com/forresst))
+  - [#7474](https://github.com/facebook/docusaurus/pull/7474) chore(theme-translations): complete zh translations ([@Josh-Cena](https://github.com/Josh-Cena))
+  - [#7400](https://github.com/facebook/docusaurus/pull/7400) chore(theme-translations): complete Farsi translations ([@massoudmaboudi](https://github.com/massoudmaboudi))
+- `docusaurus`
+  - [#7499](https://github.com/facebook/docusaurus/pull/7499) fix: avoid printing period after localhost URL ([@Zamiell](https://github.com/Zamiell))
+- `create-docusaurus`
+  - [#7374](https://github.com/facebook/docusaurus/pull/7374) refactor(create): clean up logic when prompting for unspecified arguments ([@Josh-Cena](https://github.com/Josh-Cena))
+
+#### :memo: Documentation
+
+- [#7503](https://github.com/facebook/docusaurus/pull/7503) docs: document MDXComponents scope ([@Josh-Cena](https://github.com/Josh-Cena))
+- [#7497](https://github.com/facebook/docusaurus/pull/7497) docs: link every reference of types in API table to the type definition ([@Zamiell](https://github.com/Zamiell))
+- [#7407](https://github.com/facebook/docusaurus/pull/7407) docs: add Azure SWA as deployment option ([@nitya](https://github.com/nitya))
+- [#7390](https://github.com/facebook/docusaurus/pull/7390) fix(website): use react-lite-youtube-embed for lazy YouTube video ([@matkoch](https://github.com/matkoch))
+
+#### :wrench: Maintenance
+
+- `create-docusaurus`, `docusaurus-logger`, `docusaurus-mdx-loader`, `docusaurus-migrate`, `docusaurus-module-type-aliases`, `docusaurus-plugin-client-redirects`, `docusaurus-plugin-content-blog`, `docusaurus-plugin-content-docs`, `docusaurus-plugin-content-pages`, `docusaurus-plugin-debug`, `docusaurus-plugin-google-gtag`, `docusaurus-plugin-ideal-image`, `docusaurus-plugin-pwa`, `docusaurus-plugin-sitemap`, `docusaurus-remark-plugin-npm2yarn`, `docusaurus-theme-classic`, `docusaurus-theme-common`, `docusaurus-theme-live-codeblock`, `docusaurus-theme-search-algolia`, `docusaurus-theme-translations`, `docusaurus-utils-validation`, `docusaurus-utils`, `docusaurus`, `lqip-loader`, `stylelint-copyright`
+  - [#7477](https://github.com/facebook/docusaurus/pull/7477) refactor: fix a lot of errors in type-aware linting ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-theme-classic`, `docusaurus-theme-translations`
+  - [#7447](https://github.com/facebook/docusaurus/pull/7447) refactor(theme-classic): migrate to tsc for build ([@Josh-Cena](https://github.com/Josh-Cena))
+- `stylelint-copyright`
+  - [#7441](https://github.com/facebook/docusaurus/pull/7441) refactor(stylelint-copyright): migrate to TS ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-cssnano-preset`
+  - [#7440](https://github.com/facebook/docusaurus/pull/7440) refactor(cssnano-preset): migrate to TS ([@Josh-Cena](https://github.com/Josh-Cena))
+- `create-docusaurus`, `docusaurus-logger`, `docusaurus-mdx-loader`, `docusaurus-migrate`, `docusaurus-plugin-client-redirects`, `docusaurus-plugin-content-blog`, `docusaurus-plugin-content-docs`, `docusaurus-plugin-content-pages`, `docusaurus-plugin-debug`, `docusaurus-plugin-google-analytics`, `docusaurus-plugin-google-gtag`, `docusaurus-plugin-ideal-image`, `docusaurus-plugin-pwa`, `docusaurus-plugin-sitemap`, `docusaurus-preset-classic`, `docusaurus-remark-plugin-npm2yarn`, `docusaurus-theme-classic`, `docusaurus-theme-common`, `docusaurus-theme-live-codeblock`, `docusaurus-theme-search-algolia`, `docusaurus-theme-translations`, `docusaurus-utils-common`, `docusaurus-utils-validation`, `docusaurus-utils`, `docusaurus`, `eslint-plugin`, `lqip-loader`
+  - [#7437](https://github.com/facebook/docusaurus/pull/7437) refactor: use TS project references instead of running tsc multiple times ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-plugin-pwa`
+  - [#7421](https://github.com/facebook/docusaurus/pull/7421) refactor(pwa): migrate client modules to TS ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus-theme-classic`
+  - [#7415](https://github.com/facebook/docusaurus/pull/7415) refactor(theme-classic): always collocate stylesheets with components in one folder ([@Josh-Cena](https://github.com/Josh-Cena))
+- `docusaurus`
+  - [#7405](https://github.com/facebook/docusaurus/pull/7405) refactor(core): properly code-split NotFound page ([@Josh-Cena](https://github.com/Josh-Cena))
+
+#### Committers: 23
+
+- Akara ([@Messiahhh](https://github.com/Messiahhh))
+- Benjamin Diolez ([@BenDz](https://github.com/BenDz))
+- Charles Korn ([@charleskorn](https://github.com/charleskorn))
+- Designatory ([@Designatory](https://github.com/Designatory))
+- Forresst ([@forresst](https://github.com/forresst))
+- Ggicci ([@ggicci](https://github.com/ggicci))
+- James ([@Zamiell](https://github.com/Zamiell))
+- Jan Peer Stöcklmair ([@JPeer264](https://github.com/JPeer264))
+- Jeremy ([@jrmyw92](https://github.com/jrmyw92))
+- Joshua Chen ([@Josh-Cena](https://github.com/Josh-Cena))
+- Junjie ([@junjieweb](https://github.com/junjieweb))
+- Lane Goolsby ([@lanegoolsby](https://github.com/lanegoolsby))
+- Massoud Maboudi ([@massoudmaboudi](https://github.com/massoudmaboudi))
+- Matthias Koch ([@matkoch](https://github.com/matkoch))
+- Michael Hughes ([@mhughes2k](https://github.com/mhughes2k))
+- Ngô Quốc Đạt ([@datlechin](https://github.com/datlechin))
+- Nitya Narasimhan ([@nitya](https://github.com/nitya))
+- Oluwatobi Sofela ([@oluwatobiss](https://github.com/oluwatobiss))
+- Ori Shalom ([@ori-shalom](https://github.com/ori-shalom))
+- Pranab Das ([@pranabdas](https://github.com/pranabdas))
+- Rui Peres ([@RuiAAPeres](https://github.com/RuiAAPeres))
+- Sébastien Lorber ([@slorber](https://github.com/slorber))
+- 凱恩 Kane ([@Gary50613](https://github.com/Gary50613))
+
 ## 2.0.0-beta.20 (2022-05-05)
 
 #### :bug: Bug Fix
diff --git a/admin/new.docusaurus.io/package.json b/admin/new.docusaurus.io/package.json
index 07fa3c05d87e..fe86a0cbfacd 100644
--- a/admin/new.docusaurus.io/package.json
+++ b/admin/new.docusaurus.io/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.docusaurus.io",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "private": true,
   "scripts": {
     "start": "npx --package netlify-cli netlify dev"
diff --git a/lerna.json b/lerna.json
index 264ec32ae60f..b1fa19591185 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "changelog": {
diff --git a/packages/create-docusaurus/package.json b/packages/create-docusaurus/package.json
index f4ca79dcd026..9984e76be577 100755
--- a/packages/create-docusaurus/package.json
+++ b/packages/create-docusaurus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-docusaurus",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Create Docusaurus apps easily.",
   "type": "module",
   "repository": {
@@ -22,8 +22,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
     "commander": "^5.1.0",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",
diff --git a/packages/create-docusaurus/templates/classic-typescript/package.json b/packages/create-docusaurus/templates/classic-typescript/package.json
index 22520824356d..44ae46ef4e49 100644
--- a/packages/create-docusaurus/templates/classic-typescript/package.json
+++ b/packages/create-docusaurus/templates/classic-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-typescript-template",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -15,8 +15,8 @@
     "typecheck": "tsc"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/preset-classic": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/preset-classic": "2.0.0-beta.21",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.3.3",
@@ -24,7 +24,7 @@
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "@tsconfig/docusaurus": "^1.0.5",
     "typescript": "^4.6.4"
   },
diff --git a/packages/create-docusaurus/templates/classic/package.json b/packages/create-docusaurus/templates/classic/package.json
index c7be6e72caaa..4eb48ab1e867 100644
--- a/packages/create-docusaurus/templates/classic/package.json
+++ b/packages/create-docusaurus/templates/classic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-classic-template",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -14,8 +14,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/preset-classic": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/preset-classic": "2.0.0-beta.21",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "prism-react-renderer": "^1.3.3",
@@ -23,7 +23,7 @@
     "react-dom": "^17.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20"
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21"
   },
   "browserslist": {
     "production": [
diff --git a/packages/create-docusaurus/templates/facebook/package.json b/packages/create-docusaurus/templates/facebook/package.json
index 7f1d5ed537d1..95e6962243ae 100644
--- a/packages/create-docusaurus/templates/facebook/package.json
+++ b/packages/create-docusaurus/templates/facebook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-2-facebook-template",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -18,8 +18,8 @@
     "format:diff": "prettier --config .prettierrc --list-different \"**/*.{js,jsx,ts,tsx,md,mdx}\""
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/preset-classic": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/preset-classic": "2.0.0-beta.21",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "react": "^17.0.2",
diff --git a/packages/docusaurus-cssnano-preset/package.json b/packages/docusaurus-cssnano-preset/package.json
index aec575bf1c3b..7e92802bbc20 100644
--- a/packages/docusaurus-cssnano-preset/package.json
+++ b/packages/docusaurus-cssnano-preset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/cssnano-preset",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Advanced cssnano preset for maximum optimization.",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/packages/docusaurus-logger/package.json b/packages/docusaurus-logger/package.json
index 2c6dcab1b1c8..6175c913da49 100644
--- a/packages/docusaurus-logger/package.json
+++ b/packages/docusaurus-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/logger",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "An encapsulated logger for semantically formatting console messages.",
   "main": "./lib/index.js",
   "repository": {
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
index f0faef6e5ffb..47e40510dafe 100644
--- a/packages/docusaurus-mdx-loader/package.json
+++ b/packages/docusaurus-mdx-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/mdx-loader",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docusaurus Loader for MDX",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,8 +20,8 @@
   "dependencies": {
     "@babel/parser": "^7.18.3",
     "@babel/traverse": "^7.18.2",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
     "@mdx-js/mdx": "^1.6.22",
     "escape-html": "^1.0.3",
     "file-loader": "^6.2.0",
@@ -36,7 +36,7 @@
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/escape-html": "^1.0.2",
     "@types/mdast": "^3.0.10",
     "@types/stringify-object": "^3.3.1",
diff --git a/packages/docusaurus-migrate/package.json b/packages/docusaurus-migrate/package.json
index e7517316e6f0..efd00b2b2f2a 100644
--- a/packages/docusaurus-migrate/package.json
+++ b/packages/docusaurus-migrate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/migrate",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "A CLI tool to migrate from older versions of Docusaurus.",
   "license": "MIT",
   "engines": {
@@ -24,8 +24,8 @@
   "dependencies": {
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
     "@mapbox/hast-util-to-jsx": "^2.0.0",
     "color": "^4.2.3",
     "commander": "^5.1.0",
diff --git a/packages/docusaurus-module-type-aliases/package.json b/packages/docusaurus-module-type-aliases/package.json
index daf13c265c7e..3c9d3d4f2eba 100644
--- a/packages/docusaurus-module-type-aliases/package.json
+++ b/packages/docusaurus-module-type-aliases/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/module-type-aliases",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docusaurus module type aliases.",
   "types": "./src/index.d.ts",
   "publishConfig": {
@@ -12,7 +12,7 @@
     "directory": "packages/docusaurus-module-type-aliases"
   },
   "dependencies": {
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/react": "*",
     "@types/react-router-config": "*",
     "@types/react-router-dom": "*",
diff --git a/packages/docusaurus-plugin-client-redirects/package.json b/packages/docusaurus-plugin-client-redirects/package.json
index b0a378708339..57f3e138b7cb 100644
--- a/packages/docusaurus-plugin-client-redirects/package.json
+++ b/packages/docusaurus-plugin-client-redirects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-client-redirects",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Client redirects plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,18 +18,18 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-common": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-common": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "eta": "^1.12.3",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json
index 85ce797f5e6e..8f24c3cfc14d 100644
--- a/packages/docusaurus-plugin-content-blog/package.json
+++ b/packages/docusaurus-plugin-content-blog/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-blog",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Blog plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-blog.d.ts",
@@ -18,12 +18,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/mdx-loader": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-common": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-common": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "cheerio": "^1.0.0-rc.11",
     "feed": "^4.2.2",
     "fs-extra": "^10.1.0",
@@ -36,7 +36,7 @@
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/types": "2.0.0-beta.21",
     "escape-string-regexp": "^4.0.0"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index 0a49a06e77ec..b93c676daf14 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-docs",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docs plugin for Docusaurus.",
   "main": "lib/index.js",
   "sideEffects": false,
@@ -25,11 +25,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/mdx-loader": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "combine-promises": "^1.1.0",
     "fs-extra": "^10.1.0",
     "import-fresh": "^3.3.0",
@@ -41,8 +41,8 @@
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/js-yaml": "^4.0.5",
     "@types/picomatch": "^2.3.0",
     "commander": "^5.1.0",
diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json
index 4ec059c3cfef..8ea086319ad5 100644
--- a/packages/docusaurus-plugin-content-pages/package.json
+++ b/packages/docusaurus-plugin-content-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-content-pages",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Pages plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-content-pages.d.ts",
@@ -18,17 +18,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/mdx-loader": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "fs-extra": "^10.1.0",
     "remark-admonitions": "^1.2.1",
     "tslib": "^2.4.0",
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json
index 98f9c72f08cf..1c67b206460f 100644
--- a/packages/docusaurus-plugin-debug/package.json
+++ b/packages/docusaurus-plugin-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-debug",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Debug plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "src/plugin-debug.d.ts",
@@ -20,14 +20,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
     "fs-extra": "^10.1.0",
     "react-json-view": "^1.21.3",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json
index d97f66f979a6..f1b6d842bc54 100644
--- a/packages/docusaurus-plugin-google-analytics/package.json
+++ b/packages/docusaurus-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-google-analytics",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Global analytics (analytics.js) plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,12 +18,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json
index 146b913d71da..80456c6ffa89 100644
--- a/packages/docusaurus-plugin-google-gtag/package.json
+++ b/packages/docusaurus-plugin-google-gtag/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-google-gtag",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Global Site Tag (gtag.js) plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,12 +18,12 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index 87f220d1521e..d653cec6f0e0 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-ideal-image",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder).",
   "main": "lib/index.js",
   "types": "src/plugin-ideal-image.d.ts",
@@ -20,11 +20,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/lqip-loader": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/lqip-loader": "2.0.0-beta.21",
     "@docusaurus/responsive-loader": "^1.7.0",
-    "@docusaurus/theme-translations": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "@endiliey/react-ideal-image": "^0.0.11",
     "react-waypoint": "^10.1.0",
     "sharp": "^0.30.5",
@@ -32,8 +32,8 @@
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "fs-extra": "^10.1.0"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json
index 9aaa0acdfbea..6aa7138c16d8 100644
--- a/packages/docusaurus-plugin-pwa/package.json
+++ b/packages/docusaurus-plugin-pwa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-pwa",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docusaurus Plugin to add PWA support.",
   "main": "lib/index.js",
   "types": "src/plugin-pwa.d.ts",
@@ -22,11 +22,11 @@
   "dependencies": {
     "@babel/core": "^7.18.2",
     "@babel/preset-env": "^7.18.2",
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
-    "@docusaurus/theme-translations": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "babel-loader": "^8.2.5",
     "clsx": "^1.1.1",
     "core-js": "^3.22.7",
@@ -39,7 +39,7 @@
     "workbox-window": "^6.5.3"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "fs-extra": "^10.1.0"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json
index f6fd11b8921b..e3914972950f 100644
--- a/packages/docusaurus-plugin-sitemap/package.json
+++ b/packages/docusaurus-plugin-sitemap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/plugin-sitemap",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Simple sitemap generation plugin for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,17 +18,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-common": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-common": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "fs-extra": "^10.1.0",
     "sitemap": "^7.1.1",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json
index 40a209675956..9bbd73146a14 100644
--- a/packages/docusaurus-preset-classic/package.json
+++ b/packages/docusaurus-preset-classic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/preset-classic",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Classic preset for Docusaurus.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,17 +18,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-blog": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-docs": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-pages": "2.0.0-beta.20",
-    "@docusaurus/plugin-debug": "2.0.0-beta.20",
-    "@docusaurus/plugin-google-analytics": "2.0.0-beta.20",
-    "@docusaurus/plugin-google-gtag": "2.0.0-beta.20",
-    "@docusaurus/plugin-sitemap": "2.0.0-beta.20",
-    "@docusaurus/theme-classic": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
-    "@docusaurus/theme-search-algolia": "2.0.0-beta.20"
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-blog": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-docs": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-pages": "2.0.0-beta.21",
+    "@docusaurus/plugin-debug": "2.0.0-beta.21",
+    "@docusaurus/plugin-google-analytics": "2.0.0-beta.21",
+    "@docusaurus/plugin-google-gtag": "2.0.0-beta.21",
+    "@docusaurus/plugin-sitemap": "2.0.0-beta.21",
+    "@docusaurus/theme-classic": "2.0.0-beta.21",
+    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/theme-search-algolia": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-remark-plugin-npm2yarn/package.json b/packages/docusaurus-remark-plugin-npm2yarn/package.json
index 0c9c44fdc3a2..3f2ab9582005 100644
--- a/packages/docusaurus-remark-plugin-npm2yarn/package.json
+++ b/packages/docusaurus-remark-plugin-npm2yarn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/remark-plugin-npm2yarn",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Remark plugin for converting npm commands to Yarn commands as tabs.",
   "main": "lib/index.js",
   "publishConfig": {
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 9439db4a2c40..6eba97104c4b 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-classic",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Classic theme for Docusaurus",
   "main": "lib/index.js",
   "types": "src/theme-classic.d.ts",
@@ -20,15 +20,15 @@
     "copy:watch": "node ../../admin/scripts/copyUntypedFiles.js --watch"
   },
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-blog": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-docs": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-pages": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
-    "@docusaurus/theme-translations": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-common": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-blog": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-docs": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-pages": "2.0.0-beta.21",
+    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-common": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
     "copy-text-to-clipboard": "^3.0.1",
@@ -43,8 +43,8 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/mdx-js__react": "^1.5.5",
     "@types/nprogress": "^0.2.0",
     "@types/prismjs": "^1.26.0",
diff --git a/packages/docusaurus-theme-common/package.json b/packages/docusaurus-theme-common/package.json
index 9e0208c32eb4..8aac5aa0d043 100644
--- a/packages/docusaurus-theme-common/package.json
+++ b/packages/docusaurus-theme-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-common",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Common code for Docusaurus themes.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -28,10 +28,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-blog": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-docs": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-pages": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-blog": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-docs": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-pages": "2.0.0-beta.21",
     "clsx": "^1.1.1",
     "parse-numeric-range": "^1.3.0",
     "prism-react-renderer": "^1.3.3",
@@ -39,8 +39,8 @@
     "utility-types": "^3.10.0"
   },
   "devDependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21"
   },
diff --git a/packages/docusaurus-theme-live-codeblock/package.json b/packages/docusaurus-theme-live-codeblock/package.json
index 4454d741c479..1f4bbe657f24 100644
--- a/packages/docusaurus-theme-live-codeblock/package.json
+++ b/packages/docusaurus-theme-live-codeblock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-live-codeblock",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docusaurus live code block component.",
   "main": "lib/index.js",
   "types": "src/theme-live-codeblock.d.ts",
@@ -23,10 +23,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
-    "@docusaurus/theme-translations": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "@philpl/buble": "^0.19.7",
     "clsx": "^1.1.1",
     "fs-extra": "^10.1.0",
@@ -34,7 +34,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/buble": "^0.20.1"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-theme-search-algolia/package.json b/packages/docusaurus-theme-search-algolia/package.json
index 518e0836e599..0a397b2ffc26 100644
--- a/packages/docusaurus-theme-search-algolia/package.json
+++ b/packages/docusaurus-theme-search-algolia/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-search-algolia",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Algolia search component for Docusaurus.",
   "main": "lib/index.js",
   "sideEffects": [
@@ -28,13 +28,13 @@
   },
   "dependencies": {
     "@docsearch/react": "^3.1.0",
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/plugin-content-docs": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
-    "@docusaurus/theme-translations": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/plugin-content-docs": "2.0.0-beta.21",
+    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "algoliasearch": "^4.13.1",
     "algoliasearch-helper": "^3.8.2",
     "clsx": "^1.1.1",
@@ -45,7 +45,7 @@
     "utility-types": "^3.10.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20"
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-theme-translations/package.json b/packages/docusaurus-theme-translations/package.json
index 5b10cbf18e24..3e4d47626f8b 100644
--- a/packages/docusaurus-theme-translations/package.json
+++ b/packages/docusaurus-theme-translations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/theme-translations",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Docusaurus theme translations.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -23,8 +23,8 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
     "lodash": "^4.17.21"
   },
   "engines": {
diff --git a/packages/docusaurus-types/package.json b/packages/docusaurus-types/package.json
index 051f1625c8ff..56e45bc4afd6 100644
--- a/packages/docusaurus-types/package.json
+++ b/packages/docusaurus-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/types",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Common types for Docusaurus packages.",
   "types": "./src/index.d.ts",
   "publishConfig": {
diff --git a/packages/docusaurus-utils-common/package.json b/packages/docusaurus-utils-common/package.json
index 9bdb0b8d122c..52a8a7fdf3d4 100644
--- a/packages/docusaurus-utils-common/package.json
+++ b/packages/docusaurus-utils-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils-common",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Common (Node/Browser) utility functions for Docusaurus packages.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -22,7 +22,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20"
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "engines": {
     "node": ">=16.14"
diff --git a/packages/docusaurus-utils-validation/package.json b/packages/docusaurus-utils-validation/package.json
index 9059249d9b04..7c98f611dda3 100644
--- a/packages/docusaurus-utils-validation/package.json
+++ b/packages/docusaurus-utils-validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils-validation",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Node validation utility functions for Docusaurus packages.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,8 +18,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
     "joi": "^17.6.0",
     "js-yaml": "^4.1.0",
     "tslib": "^2.4.0"
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index 419580ce523f..4e02766a5e45 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/utils",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Node utility functions for Docusaurus packages.",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -18,7 +18,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "2.0.0-beta.20",
+    "@docusaurus/logger": "2.0.0-beta.21",
     "@svgr/webpack": "^6.2.1",
     "file-loader": "^6.2.0",
     "fs-extra": "^10.1.0",
@@ -38,7 +38,7 @@
     "node": ">=16.14"
   },
   "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/dedent": "^0.7.0",
     "@types/github-slugger": "^1.3.0",
     "@types/micromatch": "^4.0.2",
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index a5d9f7a6e23c..40218c38797a 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -43,13 +43,13 @@
     "@babel/runtime": "^7.18.3",
     "@babel/runtime-corejs3": "^7.18.3",
     "@babel/traverse": "^7.18.2",
-    "@docusaurus/cssnano-preset": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/mdx-loader": "2.0.0-beta.20",
+    "@docusaurus/cssnano-preset": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/mdx-loader": "2.0.0-beta.21",
     "@docusaurus/react-loadable": "5.5.2",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-common": "2.0.0-beta.20",
-    "@docusaurus/utils-validation": "2.0.0-beta.20",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-common": "2.0.0-beta.21",
+    "@docusaurus/utils-validation": "2.0.0-beta.21",
     "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
@@ -107,8 +107,8 @@
     "webpackbar": "^5.0.2"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.20",
-    "@docusaurus/types": "2.0.0-beta.20",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@types/detect-port": "^1.3.2",
     "@types/react-dom": "^18.0.5",
     "@types/react-router-config": "^5.0.6",
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index f5e37ce19c49..f8a2e7e1c7cf 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/eslint-plugin",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "ESLint plugin to enforce best Docusaurus practices.",
   "main": "lib/index.js",
   "keywords": [
diff --git a/packages/lqip-loader/package.json b/packages/lqip-loader/package.json
index 79cb3258bb3d..1ada06e07f96 100644
--- a/packages/lqip-loader/package.json
+++ b/packages/lqip-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/lqip-loader",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Low Quality Image Placeholders (LQIP) loader for webpack.",
   "main": "lib/index.js",
   "publishConfig": {
@@ -17,7 +17,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@docusaurus/logger": "2.0.0-beta.20",
+    "@docusaurus/logger": "2.0.0-beta.21",
     "file-loader": "^6.2.0",
     "lodash": "^4.17.21",
     "sharp": "^0.30.5",
diff --git a/packages/stylelint-copyright/package.json b/packages/stylelint-copyright/package.json
index 7a53f9f7657b..b859ae13d44a 100644
--- a/packages/stylelint-copyright/package.json
+++ b/packages/stylelint-copyright/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-copyright",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "description": "Stylelint plugin to check CSS files for a copyright header.",
   "main": "lib/index.js",
   "license": "MIT",
diff --git a/website/package.json b/website/package.json
index f03ae9a0a1d2..bff9305dd8a1 100644
--- a/website/package.json
+++ b/website/package.json
@@ -1,6 +1,6 @@
 {
   "name": "website",
-  "version": "2.0.0-beta.20",
+  "version": "2.0.0-beta.21",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",
@@ -35,18 +35,18 @@
   "dependencies": {
     "@crowdin/cli": "^3.7.8",
     "@crowdin/crowdin-api-client": "^1.18.1",
-    "@docusaurus/core": "2.0.0-beta.20",
-    "@docusaurus/logger": "2.0.0-beta.20",
-    "@docusaurus/plugin-client-redirects": "2.0.0-beta.20",
-    "@docusaurus/plugin-ideal-image": "2.0.0-beta.20",
-    "@docusaurus/plugin-pwa": "2.0.0-beta.20",
-    "@docusaurus/preset-classic": "2.0.0-beta.20",
-    "@docusaurus/remark-plugin-npm2yarn": "2.0.0-beta.20",
-    "@docusaurus/theme-classic": "2.0.0-beta.20",
-    "@docusaurus/theme-common": "2.0.0-beta.20",
-    "@docusaurus/theme-live-codeblock": "2.0.0-beta.20",
-    "@docusaurus/utils": "2.0.0-beta.20",
-    "@docusaurus/utils-common": "2.0.0-beta.20",
+    "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/plugin-client-redirects": "2.0.0-beta.21",
+    "@docusaurus/plugin-ideal-image": "2.0.0-beta.21",
+    "@docusaurus/plugin-pwa": "2.0.0-beta.21",
+    "@docusaurus/preset-classic": "2.0.0-beta.21",
+    "@docusaurus/remark-plugin-npm2yarn": "2.0.0-beta.21",
+    "@docusaurus/theme-classic": "2.0.0-beta.21",
+    "@docusaurus/theme-common": "2.0.0-beta.21",
+    "@docusaurus/theme-live-codeblock": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@docusaurus/utils-common": "2.0.0-beta.21",
     "@popperjs/core": "^2.11.5",
     "@swc/core": "^1.2.194",
     "clsx": "^1.1.1",
@@ -80,7 +80,7 @@
     ]
   },
   "devDependencies": {
-    "@docusaurus/eslint-plugin": "2.0.0-beta.20",
+    "@docusaurus/eslint-plugin": "2.0.0-beta.21",
     "@tsconfig/docusaurus": "^1.0.5",
     "@types/jest": "^27.5.1",
     "cross-env": "^7.0.3",
diff --git a/website/versioned_docs/version-2.0.0-beta.19/advanced/architecture.md b/website/versioned_docs/version-2.0.0-beta.21/advanced/architecture.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/advanced/architecture.md
rename to website/versioned_docs/version-2.0.0-beta.21/advanced/architecture.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/advanced/client.md b/website/versioned_docs/version-2.0.0-beta.21/advanced/client.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/advanced/client.md
rename to website/versioned_docs/version-2.0.0-beta.21/advanced/client.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/advanced/index.md b/website/versioned_docs/version-2.0.0-beta.21/advanced/index.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/advanced/index.md
rename to website/versioned_docs/version-2.0.0-beta.21/advanced/index.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/advanced/plugins.md b/website/versioned_docs/version-2.0.0-beta.21/advanced/plugins.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/advanced/plugins.md
rename to website/versioned_docs/version-2.0.0-beta.21/advanced/plugins.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/advanced/routing.md b/website/versioned_docs/version-2.0.0-beta.21/advanced/routing.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/advanced/routing.md
rename to website/versioned_docs/version-2.0.0-beta.21/advanced/routing.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/advanced/ssg.md b/website/versioned_docs/version-2.0.0-beta.21/advanced/ssg.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/advanced/ssg.md
rename to website/versioned_docs/version-2.0.0-beta.21/advanced/ssg.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/docusaurus.config.js.md b/website/versioned_docs/version-2.0.0-beta.21/api/docusaurus.config.js.md
similarity index 99%
rename from website/versioned_docs/version-2.0.0-beta.19/api/docusaurus.config.js.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/docusaurus.config.js.md
index 488fd728c38c..9910ddb5220a 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/docusaurus.config.js.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/api/docusaurus.config.js.md
@@ -130,7 +130,7 @@ Example:
 module.exports = {
   i18n: {
     defaultLocale: 'en',
-    locales: ['en', 'fr'],
+    locales: ['en', 'fa'],
     localeConfigs: {
       en: {
         label: 'English',
@@ -153,7 +153,7 @@ module.exports = {
 - `locales`: List of locales deployed on your site. Must contain `defaultLocale`.
 - `localeConfigs`: Individual options for each locale.
   - `label`: The label displayed for this locale in the locales dropdown.
-  - `direction`: `ltr` (default) or `rtl` (for [right-to-left languages](https://developer.mozilla.org/en-US/docs/Glossary/rtl) like Arabic, Hebrew, etc.). Used to select the locale's CSS and html meta attribute.
+  - `direction`: `ltr` (default) or `rtl` (for [right-to-left languages](https://developer.mozilla.org/en-US/docs/Glossary/rtl) like Farsi, Arabic, Hebrew, etc.). Used to select the locale's CSS and html meta attribute.
   - `htmlLang`: BCP 47 language tag to use in `<html lang="...">` and in `<link ... hreflang="...">`
   - `calendar`: the [calendar](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Locale/calendar) used to calculate the date era. Note that it doesn't control the actual string displayed: `MM/DD/YYYY` and `DD/MM/YYYY` are both `gregory`. To choose the format (`DD/MM/YYYY` or `MM/DD/YYYY`), set your locale name to `en-GB` or `en-US` (`en` means `en-US`).
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/misc/_category_.yml b/website/versioned_docs/version-2.0.0-beta.21/api/misc/_category_.yml
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/misc/_category_.yml
rename to website/versioned_docs/version-2.0.0-beta.21/api/misc/_category_.yml
diff --git a/website/versioned_docs/version-2.0.0-beta.21/api/misc/create-docusaurus.md b/website/versioned_docs/version-2.0.0-beta.21/api/misc/create-docusaurus.md
new file mode 100644
index 000000000000..e35d3884cd78
--- /dev/null
+++ b/website/versioned_docs/version-2.0.0-beta.21/api/misc/create-docusaurus.md
@@ -0,0 +1,57 @@
+---
+sidebar_position: 0
+title: '📦 create-docusaurus'
+slug: '/api/misc/create-docusaurus'
+---
+
+A scaffolding utility to help you instantly set up a functional Docusaurus app.
+
+## Usage {#usage}
+
+```bash
+npx create-docusaurus@latest [name] [template] [rootDir]
+```
+
+The `name` argument will be used as the site's path as well as the `name` field in the created app's package.json. It can be an absolute path, or a path relative to `rootDir`.
+
+The `template` argument can be one of the following:
+
+- `classic`: Uses the classic template (recommended)
+- `facebook`: Uses the Facebook/Meta template, which contains some Meta-specific setup
+- A git repo URL (beginning with `https://` or `git@`), which can be cloned to the destination
+- A local file path relative to CWD, which contains the files to be copied to destination
+
+The `rootDir` will be used to resolve the absolute path to the site directory. The default is CWD.
+
+:::caution
+
+This command should be preferably used in an interactive shell so all features are available.
+
+:::
+
+## Options {#options}
+
+### `-t, --typescript` {#typescript}
+
+Used when the template argument is a recognized name. Currently, only `classic` provides a TypeScript variant.
+
+### `-g, --git-strategy` {#git-strategy}
+
+Used when the template argument is a git repo. It needs to be one of:
+
+- `deep`: preserves full git history
+- `shallow`: clones with `--depth=1`
+- `copy`: does a shallow clone, but does not create a git repo
+- `custom`: enter your custom git clone command. We will prompt you for it. You can write something like `git clone --depth 10`, and we will append the repository URL and destination directory.
+
+### `-p, --package-manager` {#package-manager}
+
+Value should be one of `npm`, `yarn`, or `pnpm`. If it's not explicitly provided, Docusaurus will infer one based on:
+
+- The lockfile already present in the CWD (e.g. if you are setting up website in an existing project)
+- The command used to invoke `create-docusaurus` (e.g. `npm init`, `npx`, `yarn create`, etc.)
+- Interactive prompting, in case all heuristics are not present
+
+### `-s, --skip-install` {#skip-install}
+
+If provided, Docusaurus will not automatically install dependencies after creating the app. The `--package-manager` option is only useful when you are actually installing dependencies.
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/README.md b/website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/README.md
similarity index 98%
rename from website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/README.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/README.md
index 3354d63f8029..8519bcfe6ef1 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/README.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/README.md
@@ -1,5 +1,5 @@
 ---
-sidebar_position: 0
+sidebar_position: 1
 id: eslint-plugin
 title: '📦 eslint-plugin'
 slug: '/api/misc/@docusaurus/eslint-plugin'
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/no-untranslated-text.md b/website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/no-untranslated-text.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/no-untranslated-text.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/no-untranslated-text.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/string-literal-i18n-messages.md b/website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/string-literal-i18n-messages.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/misc/eslint-plugin/string-literal-i18n-messages.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/misc/eslint-plugin/string-literal-i18n-messages.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/misc/img/logger-demo.png b/website/versioned_docs/version-2.0.0-beta.21/api/misc/logger/demo.png
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/misc/img/logger-demo.png
rename to website/versioned_docs/version-2.0.0-beta.21/api/misc/logger/demo.png
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/misc/logger.md b/website/versioned_docs/version-2.0.0-beta.21/api/misc/logger/logger.md
similarity index 97%
rename from website/versioned_docs/version-2.0.0-beta.19/api/misc/logger.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/misc/logger/logger.md
index 290bc762c01e..fb291473dd5f 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/misc/logger.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/api/misc/logger/logger.md
@@ -1,7 +1,7 @@
 ---
-sidebar_position: 1
+sidebar_position: 2
 title: '📦 logger'
-slug: '/api/plugins/@docusaurus/logger'
+slug: '/api/misc/@docusaurus/logger'
 ---
 
 An encapsulated logger for semantically formatting console messages.
@@ -64,4 +64,4 @@ An embedded expression is optionally preceded by a flag in the form `[a-z]+=` (a
 
 If the expression is an array, it's formatted by `` `\n- ${array.join('\n- ')}\n` `` (note it automatically gets a leading line end). Each member is formatted by itself and the bullet is not formatted. So you would see the above message printed as:
 
-![demo](./img/logger-demo.png)
+![demo](./demo.png)
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/README.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/README.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/README.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/README.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/_category_.yml b/website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/_category_.yml
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/_category_.yml
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/_category_.yml
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/extend-infrastructure.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/extend-infrastructure.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/extend-infrastructure.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/extend-infrastructure.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/i18n-lifecycles.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/i18n-lifecycles.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/i18n-lifecycles.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/i18n-lifecycles.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/lifecycle-apis.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/lifecycle-apis.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/lifecycle-apis.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/lifecycle-apis.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/static-methods.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/static-methods.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugin-methods/static-methods.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugin-methods/static-methods.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/_category_.yml b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/_category_.yml
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/_category_.yml
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/_category_.yml
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/overview.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/overview.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/overview.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/overview.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-client-redirects.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-client-redirects.md
similarity index 87%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-client-redirects.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-client-redirects.md
index 3b881f58810a..991ea778ad91 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-client-redirects.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/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/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-blog.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-content-blog.md
similarity index 92%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-blog.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-content-blog.md
index 27db9055ecc6..8cdc51d7c668 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-blog.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/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/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-docs.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-content-docs.md
similarity index 90%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-docs.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-content-docs.md
index e5971ee2fa59..a44ce3ca1a5a 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-docs.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/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,38 +76,34 @@ 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};
   /** 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. */
@@ -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]: {
     /**
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-pages.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-content-pages.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-content-pages.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-content-pages.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-debug.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-debug.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-debug.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-debug.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-google-analytics.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-google-analytics.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-google-analytics.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-google-analytics.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-google-gtag.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-google-gtag.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-google-gtag.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-google-gtag.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-ideal-image.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-ideal-image.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-ideal-image.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-ideal-image.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-pwa.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-pwa.md
similarity index 91%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-pwa.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-pwa.md
index 1a7ab67bbe01..a732e8094d68 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-pwa.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/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:
 
@@ -171,30 +171,9 @@ module.exports = {
 };
 ```
 
-### `reloadPopup` {#reloadpopup}
-
-- Type: `string | false`
-- Default: `'@theme/PwaReloadPopup'`
-
-Module path to reload popup component. This popup is rendered when a new service worker is waiting to be installed, and we suggest a reload to the user.
-
-Passing `false` will disable the popup, but this is not recommended: users won't have a way to get up-to-date content.
-
-A custom component can be used, as long as it accepts `onReload` as a prop. The `onReload` callback should be called when the `reload` button is clicked. This will tell the service worker to install the waiting service worker and reload the page.
-
-```ts
-interface PwaReloadPopupProps {
-  onReload: () => void;
-}
-```
-
-The default theme includes an implementation for the reload popup and uses [Infima Alerts](https://infima.dev/docs/components/alert).
-
-![pwa_reload.gif](/img/pwa_reload.gif)
-
 ### `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:
@@ -312,3 +291,13 @@ import CodeBlock from '@theme/CodeBlock';
   {JSON.stringify(require("@site/static/manifest.json"),null,2)}
 </CodeBlock>
 ```
+
+## Customizing reload popup {#customizing-reload-popup}
+
+The `@theme/PwaReloadPopup` component is rendered when a new service worker is waiting to be installed, and we suggest a reload to the user. You can [swizzle](../../swizzling.md) this component and implement your own UI. It will receive an `onReload` callback as props, which should be called when the `reload` button is clicked. This will tell the service worker to install the waiting service worker and reload the page.
+
+The default theme includes an implementation for the reload popup and uses [Infima Alerts](https://infima.dev/docs/components/alert).
+
+![pwa_reload.gif](/img/pwa_reload.gif)
+
+Your component can render `null`, but this is not recommended: users won't have a way to get up-to-date content.
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-sitemap.md b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-sitemap.md
similarity index 90%
rename from website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-sitemap.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-sitemap.md
index 0d37d2345151..145b62d9e258 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/plugins/plugin-sitemap.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/api/plugins/plugin-sitemap.md
@@ -40,6 +40,7 @@ Accepted fields:
 | `changefreq` | `string` | `'weekly'` | See [sitemap docs](https://www.sitemaps.org/protocol.html#xmlTagDefinitions) |
 | `priority` | `number` | `0.5` | See [sitemap docs](https://www.sitemaps.org/protocol.html#xmlTagDefinitions) |
 | `ignorePatterns` | `string[]` | `[]` | A list of glob patterns; matching route paths will be filtered from the sitemap. Note that you may need to include the base URL in here. |
+| `filename` | `string` | `sitemap.xml` | The path to the created sitemap file, relative to the output directory. Useful if you have two plugin instances outputting two files. |
 
 </APITable>
 
@@ -70,6 +71,7 @@ const config = {
   changefreq: 'weekly',
   priority: 0.5,
   ignorePatterns: ['/tags/**'],
+  filename: 'sitemap.xml',
 };
 ```
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/themes/_category_.yml b/website/versioned_docs/version-2.0.0-beta.21/api/themes/_category_.yml
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/themes/_category_.yml
rename to website/versioned_docs/version-2.0.0-beta.21/api/themes/_category_.yml
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/themes/overview.md b/website/versioned_docs/version-2.0.0-beta.21/api/themes/overview.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/themes/overview.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/themes/overview.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-classic.md b/website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-classic.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-classic.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-classic.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-configuration.md b/website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-configuration.md
similarity index 99%
rename from website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-configuration.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-configuration.md
index 02e3c66db8f5..d1291bbc3cbc 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-configuration.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/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>
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-live-codeblock.md b/website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-live-codeblock.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-live-codeblock.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-live-codeblock.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-search-algolia.md b/website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-search-algolia.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/api/themes/theme-search-algolia.md
rename to website/versioned_docs/version-2.0.0-beta.21/api/themes/theme-search-algolia.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/assets/docusaurus-asset-example-banner.png b/website/versioned_docs/version-2.0.0-beta.21/assets/docusaurus-asset-example-banner.png
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/assets/docusaurus-asset-example-banner.png
rename to website/versioned_docs/version-2.0.0-beta.21/assets/docusaurus-asset-example-banner.png
diff --git a/website/versioned_docs/version-2.0.0-beta.19/assets/docusaurus-asset-example.docx b/website/versioned_docs/version-2.0.0-beta.21/assets/docusaurus-asset-example.docx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/assets/docusaurus-asset-example.docx
rename to website/versioned_docs/version-2.0.0-beta.21/assets/docusaurus-asset-example.docx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/assets/docusaurus-asset-example.xyz b/website/versioned_docs/version-2.0.0-beta.21/assets/docusaurus-asset-example.xyz
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/assets/docusaurus-asset-example.xyz
rename to website/versioned_docs/version-2.0.0-beta.21/assets/docusaurus-asset-example.xyz
diff --git a/website/versioned_docs/version-2.0.0-beta.19/blog.mdx b/website/versioned_docs/version-2.0.0-beta.21/blog.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/blog.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/blog.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/browser-support.md b/website/versioned_docs/version-2.0.0-beta.21/browser-support.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/browser-support.md
rename to website/versioned_docs/version-2.0.0-beta.21/browser-support.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/cli.md b/website/versioned_docs/version-2.0.0-beta.21/cli.md
similarity index 97%
rename from website/versioned_docs/version-2.0.0-beta.19/cli.md
rename to website/versioned_docs/version-2.0.0-beta.21/cli.md
index d1bec4d09ce4..c1b79ddd9d87 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/cli.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/cli.md
@@ -43,6 +43,7 @@ Builds and serves a preview of your site locally with [Webpack Dev Server](https
 | `--no-open` | `false` | Do not open automatically the page in the browser. |
 | `--config` | `undefined` | Path to docusaurus config file, default to `[siteDir]/docusaurus.config.js` |
 | `--poll [optionalIntervalMs]` | `false` | Use polling of files rather than watching for live reload as a fallback in environments where watching doesn't work. More information [here](https://webpack.js.org/configuration/watch/#watchoptionspoll). |
+| `--no-minify` | `false` | Build website without minimizing JS/CSS bundles. |
 
 :::important
 
@@ -149,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}
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/configuration.md b/website/versioned_docs/version-2.0.0-beta.21/configuration.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/configuration.md
rename to website/versioned_docs/version-2.0.0-beta.21/configuration.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/deployment.mdx b/website/versioned_docs/version-2.0.0-beta.21/deployment.mdx
similarity index 97%
rename from website/versioned_docs/version-2.0.0-beta.19/deployment.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/deployment.mdx
index 9674693bce28..23ea588caf49 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/deployment.mdx
+++ b/website/versioned_docs/version-2.0.0-beta.21/deployment.mdx
@@ -778,3 +778,7 @@ See [docs](https://docs.quantcdn.io/docs/cli/continuous-integration) and [blog](
 ## Deploying to Cloudflare Pages {#deploying-to-cloudflare-pages}
 
 [Cloudflare Pages](https://pages.cloudflare.com/) is a Jamstack platform for frontend developers to collaborate and deploy websites. Get started within a few minutes by following [this article](https://dev.to/apidev234/deploying-docusaurus-to-cloudflare-pages-565g).
+
+## Deploying to Azure Static Web Apps {#deploying-to-azure-static-web-apps}
+
+[Azure Static Web Apps](https://docs.microsoft.com/en-us/azure/static-web-apps/overview) is a service that automatically builds and deploys full-stack web apps to Azure directly from the code repository, simplifying the developer experience for CI/CD. Static Web Apps separates the web application's static assets from its dynamic (API) endpoints. Static assets are served from globally-distributed content servers, making it faster for clients to retrieve files using servers nearby. Dynamic APIs are scaled with serverless architectures, using an event-driven functions-based approach that is more cost-effective and scales on demand. Get started in a few minutes by following [this step-by-step guide](https://dev.to/azure/11-share-content-with-docusaurus-azure-static-web-apps-30hc).
diff --git a/website/versioned_docs/version-2.0.0-beta.19/docusaurus-core.md b/website/versioned_docs/version-2.0.0-beta.21/docusaurus-core.md
similarity index 97%
rename from website/versioned_docs/version-2.0.0-beta.19/docusaurus-core.md
rename to website/versioned_docs/version-2.0.0-beta.21/docusaurus-core.md
index 372c1a001fe9..c43d22c061e0 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/docusaurus-core.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/docusaurus-core.md
@@ -55,7 +55,13 @@ This component doesn't catch build-time errors and only protects against client-
 
 #### Props {#errorboundary-props}
 
-- `fallback`: an optional callback returning a JSX element. It will receive 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}
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/creating-pages.md b/website/versioned_docs/version-2.0.0-beta.21/guides/creating-pages.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/creating-pages.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/creating-pages.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/docs-create-doc.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/docs-create-doc.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/docs-create-doc.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/docs-create-doc.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/docs-introduction.md b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/docs-introduction.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/docs-introduction.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/docs-introduction.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/docs-multi-instance.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/docs-multi-instance.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/docs-multi-instance.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/docs-multi-instance.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/autogenerated.md b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/autogenerated.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/autogenerated.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/autogenerated.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/index.md b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/index.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/index.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/index.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/items.md b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/items.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/items.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/items.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/multiple-sidebars.md b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/multiple-sidebars.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/sidebar/multiple-sidebars.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/sidebar/multiple-sidebars.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/versioning.md b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/versioning.md
similarity index 98%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/docs/versioning.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/docs/versioning.md
index 40eb0a2f23ac..e27512e083a6 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/guides/docs/versioning.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/guides/docs/versioning.md
@@ -161,7 +161,7 @@ Example:
 
 The "current" version is the version name for the `./docs` folder. There are different ways to manage versioning, but two very common patterns are:
 
-- You release v1, and start immediately working on v2 (including its docs). In this case, the **current version** is v2, which is in the `./docs` folder, while the **latest version** is v1, which is the version hosted at `example.com/docs` and is browsed by most of your users.
+- You release v1, and start immediately working on v2 (including its docs). In this case, the **current version** is v2, which is in the `./docs` source folder, and can be browsed at `example.com/docs/next`. The **latest version** is v1, which is in the `./versioned_docs/version-1` source folder, and is browsed by most of your users at `example.com/docs`.
 - You release v1, and will maintain it for some time before thinking about v2. In this case, the **current version** and **latest version** will both be point to v1, since the v2 docs doesn't even exist yet!
 
 Docusaurus defaults work great for the first use case. We will label the current version as "next" and you can even choose not to publish it.
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/_markdown-partial-example.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/_markdown-partial-example.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/_markdown-partial-example.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/_markdown-partial-example.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-admonitions.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-admonitions.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-admonitions.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-admonitions.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-assets.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-assets.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-assets.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-assets.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-code-blocks.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-code-blocks.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-code-blocks.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-code-blocks.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-head-metadata.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-head-metadata.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-head-metadata.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-head-metadata.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-intro.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-intro.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-intro.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-intro.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-links.md b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-links.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-links.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-links.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-math-equations.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-math-equations.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-math-equations.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-math-equations.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-plugins.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-plugins.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-plugins.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-plugins.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-react.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-react.mdx
similarity index 80%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-react.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-react.mdx
index 6422961e3c34..ca1588df16b1 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-react.mdx
+++ b/website/versioned_docs/version-2.0.0-beta.21/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/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-react.module.css b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-react.module.css
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-react.module.css
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-react.module.css
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-tabs-styles.module.css b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-tabs-styles.module.css
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-tabs-styles.module.css
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-tabs-styles.module.css
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-tabs.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-tabs.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-tabs.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-tabs.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-toc.mdx b/website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-toc.mdx
similarity index 99%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-toc.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/guides/markdown-features/markdown-features-toc.mdx
index 18e2d5d17614..1cc1ed43d27c 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/guides/markdown-features/markdown-features-toc.mdx
+++ b/website/versioned_docs/version-2.0.0-beta.21/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.
diff --git a/website/versioned_docs/version-2.0.0-beta.19/guides/whats-next.md b/website/versioned_docs/version-2.0.0-beta.21/guides/whats-next.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/guides/whats-next.md
rename to website/versioned_docs/version-2.0.0-beta.21/guides/whats-next.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-crowdin.mdx b/website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-crowdin.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-crowdin.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-crowdin.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-git.md b/website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-git.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-git.md
rename to website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-git.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-introduction.md b/website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-introduction.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-introduction.md
rename to website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-introduction.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-tutorial.md b/website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-tutorial.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/i18n/i18n-tutorial.md
rename to website/versioned_docs/version-2.0.0-beta.21/i18n/i18n-tutorial.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/installation.md b/website/versioned_docs/version-2.0.0-beta.21/installation.md
similarity index 89%
rename from website/versioned_docs/version-2.0.0-beta.19/installation.md
rename to website/versioned_docs/version-2.0.0-beta.21/installation.md
index a759bf8c4363..92576624eec1 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/installation.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/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}
@@ -28,22 +28,12 @@ Use **[docusaurus.new](https://docusaurus.new)** to test Docusaurus immediately
 The easiest way to install Docusaurus is to use the command line tool that helps you scaffold a skeleton Docusaurus website. You can run this command anywhere in a new empty repository or within an existing repository, it will create a new directory containing the scaffolded files.
 
 ```bash
-npx create-docusaurus@latest [name] [template]
+npx create-docusaurus@latest my-website classic
 ```
 
-Example:
-
-```bash
-npx create-docusaurus@latest website classic
-```
-
-If you do not specify `name` or `template`, it will prompt you for them.
-
 We recommend the `classic` template so that you can get started quickly, and it contains features found in Docusaurus 1. The `classic` template contains `@docusaurus/preset-classic` which includes standard documentation, a blog, custom pages, and a CSS framework (with dark mode support). You can get up and running extremely quickly with the classic template and customize things later on when you have gained more familiarity with Docusaurus.
 
-The `template` also accepts a git repo URL or a local file path, with the latter evaluated relative to the current working directory. The repo/folder content will be copied to the site directory. If it's a git repository, you can also specify a cloning strategy.
-
-You can also use the template's TypeScript variant by passing the `--typescript` flag.
+You can also use the template's TypeScript variant by passing the `--typescript` flag. See [TypeScript support](./typescript-support.md) for more information.
 
 ```bash
 npx create-docusaurus@latest my-website classic --typescript
@@ -98,14 +88,7 @@ pnpm create docusaurus
 
 </details>
 
-Docusaurus makes best efforts to select a package manager to install dependencies for you, based on the command you are using and the project you are in. You can override this behavior by using `--package-manager [npm/yarn/pnpm]`.
-
-```bash
-# Use Yarn to install dependencies even when the command is npx
-npx create-docusaurus@latest my-website classic --package-manager yarn
-```
-
-Run `npx create-docusaurus@latest --help` for more information about all available flags.
+Run `npx create-docusaurus@latest --help`, or check out its [API docs](./api/misc/create-docusaurus.md) for more information about all available flags.
 
 ## Project structure {#project-structure}
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/introduction.md b/website/versioned_docs/version-2.0.0-beta.21/introduction.md
similarity index 98%
rename from website/versioned_docs/version-2.0.0-beta.19/introduction.md
rename to website/versioned_docs/version-2.0.0-beta.21/introduction.md
index de877f623891..cec5f22c2e08 100644
--- a/website/versioned_docs/version-2.0.0-beta.19/introduction.md
+++ b/website/versioned_docs/version-2.0.0-beta.21/introduction.md
@@ -50,16 +50,20 @@ Or read the **[5-minute tutorial](https://tutorial.docusaurus.io)** online.
 
 In this presentation at [Algolia Community Event](https://www.algolia.com/), [Meta Open Source team](https://opensource.facebook.com/) shared a brief walk-through of Docusaurus. They covered how to get started with the project, enable plugins, and set up functionalities like documentation and blogging.
 
+```mdx-code-block
+import LiteYouTubeEmbed from 'react-lite-youtube-embed';
+
 <div className="video-container">
-  <iframe
-    width="560"
-    height="315"
-    src="https://www.youtube.com/embed/Yhyx7otSksg"
+  <LiteYouTubeEmbed
+    // cSpell:ignore Yhyx Sksg
+    id="Yhyx7otSksg"
+    params="autoplay=1&autohide=1&showinfo=0&rel=0"
     title="Docusaurus: Documentation Made Easy"
-    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-    allowFullScreen
+    poster="maxresdefault"
+    webp
   />
 </div>
+```
 
 ## Disclaimer {#disclaimer}
 
diff --git a/website/versioned_docs/version-2.0.0-beta.19/migration/migration-automated.md b/website/versioned_docs/version-2.0.0-beta.21/migration/migration-automated.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/migration/migration-automated.md
rename to website/versioned_docs/version-2.0.0-beta.21/migration/migration-automated.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/migration/migration-manual.md b/website/versioned_docs/version-2.0.0-beta.21/migration/migration-manual.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/migration/migration-manual.md
rename to website/versioned_docs/version-2.0.0-beta.21/migration/migration-manual.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/migration/migration-overview.md b/website/versioned_docs/version-2.0.0-beta.21/migration/migration-overview.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/migration/migration-overview.md
rename to website/versioned_docs/version-2.0.0-beta.21/migration/migration-overview.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/migration/migration-translated-sites.md b/website/versioned_docs/version-2.0.0-beta.21/migration/migration-translated-sites.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/migration/migration-translated-sites.md
rename to website/versioned_docs/version-2.0.0-beta.21/migration/migration-translated-sites.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/migration/migration-versioned-sites.md b/website/versioned_docs/version-2.0.0-beta.21/migration/migration-versioned-sites.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/migration/migration-versioned-sites.md
rename to website/versioned_docs/version-2.0.0-beta.21/migration/migration-versioned-sites.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/playground.mdx b/website/versioned_docs/version-2.0.0-beta.21/playground.mdx
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/playground.mdx
rename to website/versioned_docs/version-2.0.0-beta.21/playground.mdx
diff --git a/website/versioned_docs/version-2.0.0-beta.19/search.md b/website/versioned_docs/version-2.0.0-beta.21/search.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/search.md
rename to website/versioned_docs/version-2.0.0-beta.21/search.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/seo.md b/website/versioned_docs/version-2.0.0-beta.21/seo.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/seo.md
rename to website/versioned_docs/version-2.0.0-beta.21/seo.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/static-assets.md b/website/versioned_docs/version-2.0.0-beta.21/static-assets.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/static-assets.md
rename to website/versioned_docs/version-2.0.0-beta.21/static-assets.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/styling-layout.md b/website/versioned_docs/version-2.0.0-beta.21/styling-layout.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/styling-layout.md
rename to website/versioned_docs/version-2.0.0-beta.21/styling-layout.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/swizzling.md b/website/versioned_docs/version-2.0.0-beta.21/swizzling.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/swizzling.md
rename to website/versioned_docs/version-2.0.0-beta.21/swizzling.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/typescript-support.md b/website/versioned_docs/version-2.0.0-beta.21/typescript-support.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/typescript-support.md
rename to website/versioned_docs/version-2.0.0-beta.21/typescript-support.md
diff --git a/website/versioned_docs/version-2.0.0-beta.19/using-plugins.md b/website/versioned_docs/version-2.0.0-beta.21/using-plugins.md
similarity index 100%
rename from website/versioned_docs/version-2.0.0-beta.19/using-plugins.md
rename to website/versioned_docs/version-2.0.0-beta.21/using-plugins.md
diff --git a/website/versioned_sidebars/version-2.0.0-beta.19-sidebars.json b/website/versioned_sidebars/version-2.0.0-beta.21-sidebars.json
similarity index 100%
rename from website/versioned_sidebars/version-2.0.0-beta.19-sidebars.json
rename to website/versioned_sidebars/version-2.0.0-beta.21-sidebars.json
diff --git a/website/versions.json b/website/versions.json
index 5fb33d24173d..e185b9557381 100644
--- a/website/versions.json
+++ b/website/versions.json
@@ -1 +1,4 @@
-["2.0.0-beta.20", "2.0.0-beta.19"]
+[
+  "2.0.0-beta.21",
+  "2.0.0-beta.20"
+]
diff --git a/website/versionsArchived.json b/website/versionsArchived.json
index b9709b3278eb..19bfb9d3c016 100644
--- a/website/versionsArchived.json
+++ b/website/versionsArchived.json
@@ -1,4 +1,5 @@
 {
+  "2.0.0-beta.19": "https://6290e4c00805dd0009fb3080--docusaurus-2.netlify.app/docs/2.0.0-beta.19",
   "2.0.0-beta.18": "https://6273d951983dad000866c3bf--docusaurus-2.netlify.app/docs/2.0.0-beta.18",
   "2.0.0-beta.17": "https://62724e95d254fe0008823deb--docusaurus-2.netlify.app/docs/2.0.0-beta.17",
   "2.0.0-beta.16": "https://623daf53d815110008446e27--docusaurus-2.netlify.app/docs/2.0.0-beta.16",

From 432a8bd3e9f7d26d8432a3c7e1739d5f6392f90d Mon Sep 17 00:00:00 2001
From: Dharsan B <52737410+DharsanB@users.noreply.github.com>
Date: Fri, 27 May 2022 22:49:43 +0530
Subject: [PATCH 29/43] docs: update Kent C. Dodds Twitter avatar (#7512)

---
 website/src/data/tweets.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/src/data/tweets.tsx b/website/src/data/tweets.tsx
index 1e6dd02ba46d..bdf1a68b72f2 100644
--- a/website/src/data/tweets.tsx
+++ b/website/src/data/tweets.tsx
@@ -152,7 +152,7 @@ const TWEETS: TweetItem[] = [
     name: 'Kent C. Dodds',
     date: 'Nov 4, 2020',
     avatar:
-      'https://pbs.twimg.com/profile_images/1444988463216922631/IDffhy4i_400x400.jpg',
+      'https://pbs.twimg.com/profile_images/1529905780542959616/Ibwrp7VJ_400x400.jpg',
     content: (
       <>
         http://testing-library.com just got a nice update! We&apos;re now on the

From ab566ecce3a1c722bfeef26901a7a1f951179801 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Sat, 28 May 2022 19:07:45 +0800
Subject: [PATCH 30/43] docs: remove useless front matter (#7518)

---
 website/docs/api/docusaurus.config.js.md                 | 1 -
 website/docs/api/misc/create-docusaurus.md               | 5 +++--
 website/docs/api/misc/eslint-plugin/README.md            | 6 +++---
 .../docs/api/misc/eslint-plugin/no-untranslated-text.md  | 4 +++-
 .../misc/eslint-plugin/string-literal-i18n-messages.md   | 2 +-
 website/docs/api/misc/logger/logger.md                   | 5 +++--
 website/docs/api/plugins/overview.md                     | 5 +++--
 website/docs/api/plugins/plugin-client-redirects.md      | 6 +++---
 website/docs/api/plugins/plugin-content-blog.md          | 6 +++---
 website/docs/api/plugins/plugin-content-docs.md          | 6 +++---
 website/docs/api/plugins/plugin-content-pages.md         | 6 +++---
 website/docs/api/plugins/plugin-debug.md                 | 6 +++---
 website/docs/api/plugins/plugin-google-analytics.md      | 6 +++---
 website/docs/api/plugins/plugin-google-gtag.md           | 6 +++---
 website/docs/api/plugins/plugin-ideal-image.md           | 6 +++---
 website/docs/api/plugins/plugin-pwa.md                   | 6 +++---
 website/docs/api/plugins/plugin-sitemap.md               | 6 +++---
 website/docs/api/themes/overview.md                      | 5 +++--
 website/docs/api/themes/theme-classic.md                 | 6 +++---
 website/docs/api/themes/theme-configuration.md           | 8 ++++----
 website/docs/api/themes/theme-live-codeblock.md          | 6 +++---
 website/docs/api/themes/theme-search-algolia.md          | 6 +++---
 website/docs/blog.mdx                                    | 7 ++++---
 website/docs/browser-support.md                          | 5 +++--
 website/docs/cli.md                                      | 2 +-
 website/docs/configuration.md                            | 5 +++--
 website/docs/deployment.mdx                              | 5 +++--
 website/docs/docusaurus-core.md                          | 4 ++--
 website/docs/guides/creating-pages.md                    | 4 ++--
 website/docs/guides/docs/docs-create-doc.mdx             | 3 ++-
 website/docs/guides/docs/docs-introduction.md            | 3 ++-
 website/docs/guides/docs/docs-multi-instance.mdx         | 3 ++-
 website/docs/guides/docs/versioning.md                   | 8 ++++----
 .../markdown-features/markdown-features-admonitions.mdx  | 3 ++-
 .../markdown-features/markdown-features-assets.mdx       | 3 ++-
 .../markdown-features/markdown-features-code-blocks.mdx  | 3 ++-
 .../markdown-features-head-metadata.mdx                  | 1 -
 .../guides/markdown-features/markdown-features-intro.mdx | 4 ++--
 .../markdown-features-math-equations.mdx                 | 3 ++-
 .../markdown-features/markdown-features-plugins.mdx      | 3 ++-
 .../guides/markdown-features/markdown-features-react.mdx | 1 -
 .../guides/markdown-features/markdown-features-tabs.mdx  | 3 ++-
 website/docs/i18n/i18n-crowdin.mdx                       | 3 ++-
 website/docs/i18n/i18n-git.md                            | 3 ++-
 website/docs/i18n/i18n-introduction.md                   | 3 ++-
 website/docs/i18n/i18n-tutorial.md                       | 4 +++-
 website/docs/installation.md                             | 5 +++--
 website/docs/introduction.md                             | 4 ++--
 website/docs/migration/migration-automated.md            | 4 ++--
 website/docs/migration/migration-manual.md               | 4 ++--
 website/docs/migration/migration-overview.md             | 4 ++--
 website/docs/migration/migration-translated-sites.md     | 4 ++--
 website/docs/migration/migration-versioned-sites.md      | 4 ++--
 website/docs/search.md                                   | 4 ++--
 website/docs/seo.md                                      | 5 +++--
 website/docs/static-assets.md                            | 9 +++++----
 website/docs/styling-layout.md                           | 4 ++--
 website/docs/typescript-support.md                       | 5 +++--
 58 files changed, 143 insertions(+), 118 deletions(-)

diff --git a/website/docs/api/docusaurus.config.js.md b/website/docs/api/docusaurus.config.js.md
index 9910ddb5220a..d20d29d34c76 100644
--- a/website/docs/api/docusaurus.config.js.md
+++ b/website/docs/api/docusaurus.config.js.md
@@ -1,6 +1,5 @@
 ---
 sidebar_position: 0
-id: docusaurus.config.js
 description: API reference for Docusaurus configuration file.
 slug: /api/docusaurus-config
 ---
diff --git a/website/docs/api/misc/create-docusaurus.md b/website/docs/api/misc/create-docusaurus.md
index e35d3884cd78..b4dc0491e4a8 100644
--- a/website/docs/api/misc/create-docusaurus.md
+++ b/website/docs/api/misc/create-docusaurus.md
@@ -1,9 +1,10 @@
 ---
 sidebar_position: 0
-title: '📦 create-docusaurus'
-slug: '/api/misc/create-docusaurus'
+slug: /api/misc/create-docusaurus
 ---
 
+# 📦 create-docusaurus
+
 A scaffolding utility to help you instantly set up a functional Docusaurus app.
 
 ## Usage {#usage}
diff --git a/website/docs/api/misc/eslint-plugin/README.md b/website/docs/api/misc/eslint-plugin/README.md
index 8519bcfe6ef1..9d0d2236846c 100644
--- a/website/docs/api/misc/eslint-plugin/README.md
+++ b/website/docs/api/misc/eslint-plugin/README.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 1
-id: eslint-plugin
-title: '📦 eslint-plugin'
-slug: '/api/misc/@docusaurus/eslint-plugin'
+slug: /api/misc/@docusaurus/eslint-plugin
 ---
 
+# 📦 eslint-plugin
+
 [ESLint](https://eslint.org/) is a tool that statically analyzes your code and reports problems or suggests best practices through editor hints and command line. Docusaurus provides an ESLint plugin to enforce best Docusaurus practices.
 
 ## Installation
diff --git a/website/docs/api/misc/eslint-plugin/no-untranslated-text.md b/website/docs/api/misc/eslint-plugin/no-untranslated-text.md
index 346c021fe8ea..b8b282b9cbbc 100644
--- a/website/docs/api/misc/eslint-plugin/no-untranslated-text.md
+++ b/website/docs/api/misc/eslint-plugin/no-untranslated-text.md
@@ -1,9 +1,11 @@
 ---
-slug: '/api/misc/@docusaurus/eslint-plugin/no-untranslated-text'
+slug: /api/misc/@docusaurus/eslint-plugin/no-untranslated-text
 ---
 
 # no-untranslated-text
 
+import APITable from '@site/src/components/APITable';
+
 Enforce text labels in JSX to be wrapped by translate calls.
 
 When the [i18n feature](../../../i18n/i18n-introduction.md) is used, this rule ensures that all labels appearing on the website are translatable, so no string accidentally slips through untranslated.
diff --git a/website/docs/api/misc/eslint-plugin/string-literal-i18n-messages.md b/website/docs/api/misc/eslint-plugin/string-literal-i18n-messages.md
index 9829a4d89bf7..c216b78233a9 100644
--- a/website/docs/api/misc/eslint-plugin/string-literal-i18n-messages.md
+++ b/website/docs/api/misc/eslint-plugin/string-literal-i18n-messages.md
@@ -1,5 +1,5 @@
 ---
-slug: '/api/misc/@docusaurus/eslint-plugin/string-literal-i18n-messages'
+slug: /api/misc/@docusaurus/eslint-plugin/string-literal-i18n-messages
 ---
 
 # string-literal-i18n-messages
diff --git a/website/docs/api/misc/logger/logger.md b/website/docs/api/misc/logger/logger.md
index fb291473dd5f..e4591bb384d3 100644
--- a/website/docs/api/misc/logger/logger.md
+++ b/website/docs/api/misc/logger/logger.md
@@ -1,9 +1,10 @@
 ---
 sidebar_position: 2
-title: '📦 logger'
-slug: '/api/misc/@docusaurus/logger'
+slug: /api/misc/@docusaurus/logger
 ---
 
+# 📦 logger
+
 An encapsulated logger for semantically formatting console messages.
 
 Authors of packages in the Docusaurus ecosystem are encouraged to use this package to provide unified log formats.
diff --git a/website/docs/api/plugins/overview.md b/website/docs/api/plugins/overview.md
index 31897e73e682..f1d1656aa38c 100644
--- a/website/docs/api/plugins/overview.md
+++ b/website/docs/api/plugins/overview.md
@@ -1,11 +1,12 @@
 ---
 sidebar_position: 0
 id: plugins-overview
-title: 'Docusaurus plugins'
 sidebar_label: Plugins overview
-slug: '/api/plugins'
+slug: /api/plugins
 ---
 
+# Docusaurus plugins
+
 We provide official Docusaurus plugins.
 
 ## Content plugins {#content-plugins}
diff --git a/website/docs/api/plugins/plugin-client-redirects.md b/website/docs/api/plugins/plugin-client-redirects.md
index 991ea778ad91..a97122b36dbb 100644
--- a/website/docs/api/plugins/plugin-client-redirects.md
+++ b/website/docs/api/plugins/plugin-client-redirects.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 4
-id: plugin-client-redirects
-title: '📦 plugin-client-redirects'
-slug: '/api/plugins/@docusaurus/plugin-client-redirects'
+slug: /api/plugins/@docusaurus/plugin-client-redirects
 ---
 
+# 📦 plugin-client-redirects
+
 import APITable from '@site/src/components/APITable';
 
 Docusaurus Plugin to generate **client-side redirects**.
diff --git a/website/docs/api/plugins/plugin-content-blog.md b/website/docs/api/plugins/plugin-content-blog.md
index 8cdc51d7c668..52806b016873 100644
--- a/website/docs/api/plugins/plugin-content-blog.md
+++ b/website/docs/api/plugins/plugin-content-blog.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 2
-id: plugin-content-blog
-title: '📦 plugin-content-blog'
-slug: '/api/plugins/@docusaurus/plugin-content-blog'
+slug: /api/plugins/@docusaurus/plugin-content-blog
 ---
 
+# 📦 plugin-content-blog
+
 import APITable from '@site/src/components/APITable';
 
 Provides the [Blog](blog.mdx) feature and is the default blog plugin for Docusaurus.
diff --git a/website/docs/api/plugins/plugin-content-docs.md b/website/docs/api/plugins/plugin-content-docs.md
index a44ce3ca1a5a..4b7deaff16d6 100644
--- a/website/docs/api/plugins/plugin-content-docs.md
+++ b/website/docs/api/plugins/plugin-content-docs.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 1
-id: plugin-content-docs
-title: '📦 plugin-content-docs'
-slug: '/api/plugins/@docusaurus/plugin-content-docs'
+slug: /api/plugins/@docusaurus/plugin-content-docs
 ---
 
+# 📦 plugin-content-docs
+
 import APITable from '@site/src/components/APITable';
 
 Provides the [Docs](../../guides/docs/docs-introduction.md) functionality and is the default docs plugin for Docusaurus.
diff --git a/website/docs/api/plugins/plugin-content-pages.md b/website/docs/api/plugins/plugin-content-pages.md
index 7a8264d56461..23dff9c2a799 100644
--- a/website/docs/api/plugins/plugin-content-pages.md
+++ b/website/docs/api/plugins/plugin-content-pages.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 3
-id: plugin-content-pages
-title: '📦 plugin-content-pages'
-slug: '/api/plugins/@docusaurus/plugin-content-pages'
+slug: /api/plugins/@docusaurus/plugin-content-pages
 ---
 
+# 📦 plugin-content-pages
+
 import APITable from '@site/src/components/APITable';
 
 The default pages plugin for Docusaurus. The classic template ships with this plugin with default configurations. This plugin provides [creating pages](guides/creating-pages.md) functionality.
diff --git a/website/docs/api/plugins/plugin-debug.md b/website/docs/api/plugins/plugin-debug.md
index 6aea24d496f2..e8c79044d945 100644
--- a/website/docs/api/plugins/plugin-debug.md
+++ b/website/docs/api/plugins/plugin-debug.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 5
-id: plugin-debug
-title: '📦 plugin-debug'
-slug: '/api/plugins/@docusaurus/plugin-debug'
+slug: /api/plugins/@docusaurus/plugin-debug
 ---
 
+# 📦 plugin-debug
+
 ```mdx-code-block
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/website/docs/api/plugins/plugin-google-analytics.md b/website/docs/api/plugins/plugin-google-analytics.md
index da8f938732c9..5e6403652e90 100644
--- a/website/docs/api/plugins/plugin-google-analytics.md
+++ b/website/docs/api/plugins/plugin-google-analytics.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 6
-id: plugin-google-analytics
-title: '📦 plugin-google-analytics'
-slug: '/api/plugins/@docusaurus/plugin-google-analytics'
+slug: /api/plugins/@docusaurus/plugin-google-analytics
 ---
 
+# 📦 plugin-google-analytics
+
 import APITable from '@site/src/components/APITable';
 
 The default [Google Analytics](https://developers.google.com/analytics/devguides/collection/analyticsjs/) plugin. It is a JavaScript library for measuring how users interact with your website **in the production build**. If you are using Google Analytics 4 you might need to consider using [plugin-google-gtag](./plugin-google-gtag.md) instead.
diff --git a/website/docs/api/plugins/plugin-google-gtag.md b/website/docs/api/plugins/plugin-google-gtag.md
index da5a53a954bf..df65941b537b 100644
--- a/website/docs/api/plugins/plugin-google-gtag.md
+++ b/website/docs/api/plugins/plugin-google-gtag.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 7
-id: plugin-google-gtag
-title: '📦 plugin-google-gtag'
-slug: '/api/plugins/@docusaurus/plugin-google-gtag'
+slug: /api/plugins/@docusaurus/plugin-google-gtag
 ---
 
+# 📦 plugin-google-gtag
+
 import APITable from '@site/src/components/APITable';
 
 The default [Global Site Tag (gtag.js)](https://developers.google.com/analytics/devguides/collection/gtagjs/) plugin. It is a JavaScript tagging framework and API that allows you to send event data to Google Analytics, Google Ads, and Google Marketing Platform. This section describes how to configure a Docusaurus site to enable global site tag for Google Analytics.
diff --git a/website/docs/api/plugins/plugin-ideal-image.md b/website/docs/api/plugins/plugin-ideal-image.md
index db40b29d7d7f..900c54e627e7 100644
--- a/website/docs/api/plugins/plugin-ideal-image.md
+++ b/website/docs/api/plugins/plugin-ideal-image.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 8
-id: plugin-ideal-image
-title: '📦 plugin-ideal-image'
-slug: '/api/plugins/@docusaurus/plugin-ideal-image'
+slug: /api/plugins/@docusaurus/plugin-ideal-image
 ---
 
+# 📦 plugin-ideal-image
+
 import APITable from '@site/src/components/APITable';
 
 Docusaurus Plugin to generate an almost ideal image (responsive, lazy-loading, and low quality placeholder).
diff --git a/website/docs/api/plugins/plugin-pwa.md b/website/docs/api/plugins/plugin-pwa.md
index a732e8094d68..a9647173182a 100644
--- a/website/docs/api/plugins/plugin-pwa.md
+++ b/website/docs/api/plugins/plugin-pwa.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 9
-id: plugin-pwa
-title: '📦 plugin-pwa'
-slug: '/api/plugins/@docusaurus/plugin-pwa'
+slug: /api/plugins/@docusaurus/plugin-pwa
 ---
 
+# 📦 plugin-pwa
+
 Docusaurus Plugin to add PWA support using [Workbox](https://developers.google.com/web/tools/workbox). This plugin generates a [Service Worker](https://developers.google.com/web/fundamentals/primers/service-workers) in production build only, and allows you to create fully PWA-compliant documentation site with offline and installation support.
 
 ## Installation {#installation}
diff --git a/website/docs/api/plugins/plugin-sitemap.md b/website/docs/api/plugins/plugin-sitemap.md
index 145b62d9e258..b1d18e2f1e78 100644
--- a/website/docs/api/plugins/plugin-sitemap.md
+++ b/website/docs/api/plugins/plugin-sitemap.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 10
-id: plugin-sitemap
-title: '📦 plugin-sitemap'
-slug: '/api/plugins/@docusaurus/plugin-sitemap'
+slug: /api/plugins/@docusaurus/plugin-sitemap
 ---
 
+# 📦 plugin-sitemap
+
 import APITable from '@site/src/components/APITable';
 
 This plugin creates sitemaps for your site so that search engine crawlers can crawl your site more accurately.
diff --git a/website/docs/api/themes/overview.md b/website/docs/api/themes/overview.md
index 6047040db0d7..f16eff35b511 100644
--- a/website/docs/api/themes/overview.md
+++ b/website/docs/api/themes/overview.md
@@ -1,11 +1,12 @@
 ---
 sidebar_position: 0
 id: themes-overview
-title: 'Docusaurus themes'
 sidebar_label: Themes overview
-slug: '/api/themes'
+slug: /api/themes
 ---
 
+# Docusaurus themes
+
 We provide official Docusaurus themes.
 
 ## Main themes {#main-themes}
diff --git a/website/docs/api/themes/theme-classic.md b/website/docs/api/themes/theme-classic.md
index e99a320f135b..900f69cfa1d7 100644
--- a/website/docs/api/themes/theme-classic.md
+++ b/website/docs/api/themes/theme-classic.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 2
-id: theme-classic
-title: '📦 theme-classic'
-slug: '/api/themes/@docusaurus/theme-classic'
+slug: /api/themes/@docusaurus/theme-classic
 ---
 
+# 📦 theme-classic
+
 The classic theme for Docusaurus.
 
 You can refer to the [theme configuration page](theme-configuration.md) for more details on the configuration.
diff --git a/website/docs/api/themes/theme-configuration.md b/website/docs/api/themes/theme-configuration.md
index d1291bbc3cbc..7936ae6f5f21 100644
--- a/website/docs/api/themes/theme-configuration.md
+++ b/website/docs/api/themes/theme-configuration.md
@@ -1,12 +1,12 @@
 ---
 sidebar_position: 1
-id: theme-configuration
-title: 'Theme configuration'
-sidebar_label: 'Configuration'
-slug: '/api/themes/configuration'
+sidebar_label: Configuration
+slug: /api/themes/configuration
 toc_max_heading_level: 4
 ---
 
+# Theme configuration
+
 import APITable from '@site/src/components/APITable';
 
 This configuration applies to all [main themes](./overview.md).
diff --git a/website/docs/api/themes/theme-live-codeblock.md b/website/docs/api/themes/theme-live-codeblock.md
index 75e803499e54..be6f4da721d7 100644
--- a/website/docs/api/themes/theme-live-codeblock.md
+++ b/website/docs/api/themes/theme-live-codeblock.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 3
-id: theme-live-codeblock
-title: '📦 theme-live-codeblock'
-slug: '/api/themes/@docusaurus/theme-live-codeblock'
+slug: /api/themes/@docusaurus/theme-live-codeblock
 ---
 
+# 📦 theme-live-codeblock
+
 This theme provides a `@theme/CodeBlock` component that is powered by react-live. You can read more on [interactive code editor](../../guides/markdown-features/markdown-features-code-blocks.mdx#interactive-code-editor) documentation.
 
 ```bash npm2yarn
diff --git a/website/docs/api/themes/theme-search-algolia.md b/website/docs/api/themes/theme-search-algolia.md
index 05e2f767fe12..1b5ce68a74bf 100644
--- a/website/docs/api/themes/theme-search-algolia.md
+++ b/website/docs/api/themes/theme-search-algolia.md
@@ -1,10 +1,10 @@
 ---
 sidebar_position: 4
-id: theme-search-algolia
-title: '📦 theme-search-algolia'
-slug: '/api/themes/@docusaurus/theme-search-algolia'
+slug: /api/themes/@docusaurus/theme-search-algolia
 ---
 
+# 📦 theme-search-algolia
+
 This theme provides a `@theme/SearchBar` component that integrates with Algolia DocSearch easily. Combined with `@docusaurus/theme-classic`, it provides a very easy search integration. You can read more on [search](../../search.md) documentation.
 
 ```bash npm2yarn
diff --git a/website/docs/blog.mdx b/website/docs/blog.mdx
index 3e0173879a5f..25bd18f60a8e 100644
--- a/website/docs/blog.mdx
+++ b/website/docs/blog.mdx
@@ -1,12 +1,13 @@
 ---
-id: blog
-title: Blog
+description: Deploy a full-featured blog in no time with Docusaurus.
 ---
 
+# Blog
+
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-The blog feature enables you to deploy in no time a full-featured blog.
+The blog feature enables you to deploy a full-featured blog in no time.
 
 :::info
 
diff --git a/website/docs/browser-support.md b/website/docs/browser-support.md
index 6a5bbadfdcc6..a4098122e2c4 100644
--- a/website/docs/browser-support.md
+++ b/website/docs/browser-support.md
@@ -1,8 +1,9 @@
 ---
-id: browser-support
-title: Browser support
+description: How to keep a reasonable bundle size while ensuring sufficient browser support.
 ---
 
+# Browser support
+
 Docusaurus allows sites to define the list of supported browsers through a [browserslist configuration](https://github.com/browserslist/browserslist).
 
 ## Purpose {#purpose}
diff --git a/website/docs/cli.md b/website/docs/cli.md
index c1b79ddd9d87..92bf71a80633 100644
--- a/website/docs/cli.md
+++ b/website/docs/cli.md
@@ -1,5 +1,5 @@
 ---
-id: cli
+description: Docusaurus provides a set of scripts to help you generate, serve, and deploy your website.
 ---
 
 # CLI
diff --git a/website/docs/configuration.md b/website/docs/configuration.md
index 161882929c99..fcfc92e0bc17 100644
--- a/website/docs/configuration.md
+++ b/website/docs/configuration.md
@@ -1,8 +1,9 @@
 ---
-id: configuration
-title: Configuration
+description: Configuring your site's behavior through docusaurus.config.js and more.
 ---
 
+# Configuration
+
 import TOCInline from '@theme/TOCInline';
 
 Docusaurus has a unique take on configurations. We encourage you to congregate information about your site into one place. We guard the fields of this file and facilitate making this data object accessible across your site.
diff --git a/website/docs/deployment.mdx b/website/docs/deployment.mdx
index 23ea588caf49..ded6aca33f88 100644
--- a/website/docs/deployment.mdx
+++ b/website/docs/deployment.mdx
@@ -1,8 +1,9 @@
 ---
-id: deployment
-title: Deployment
+description: Deploy your Docusaurus app for production on a range of static site hosting services.
 ---
 
+# Deployment
+
 To build the static files of your website for production, run:
 
 ```bash npm2yarn
diff --git a/website/docs/docusaurus-core.md b/website/docs/docusaurus-core.md
index c43d22c061e0..807727872e16 100644
--- a/website/docs/docusaurus-core.md
+++ b/website/docs/docusaurus-core.md
@@ -1,9 +1,9 @@
 ---
-id: docusaurus-core
-title: Docusaurus Client API
 sidebar_label: Client API
 ---
 
+# Docusaurus Client API
+
 Docusaurus provides some APIs on the clients that can be helpful to you when building your site.
 
 ## Components {#components}
diff --git a/website/docs/guides/creating-pages.md b/website/docs/guides/creating-pages.md
index cdf100cdf9a9..0f5839213a5c 100644
--- a/website/docs/guides/creating-pages.md
+++ b/website/docs/guides/creating-pages.md
@@ -1,10 +1,10 @@
 ---
-id: creating-pages
-title: Creating Pages
 slug: /creating-pages
 sidebar_label: Pages
 ---
 
+# Creating Pages
+
 In this section, we will learn about creating pages in Docusaurus.
 
 The `@docusaurus/plugin-content-pages` plugin empowers you to create **one-off standalone pages** like a showcase page, playground page, or support page. You can use React components, or Markdown.
diff --git a/website/docs/guides/docs/docs-create-doc.mdx b/website/docs/guides/docs/docs-create-doc.mdx
index f81121781d1d..baf451a96a0f 100644
--- a/website/docs/guides/docs/docs-create-doc.mdx
+++ b/website/docs/guides/docs/docs-create-doc.mdx
@@ -1,10 +1,11 @@
 ---
 id: create-doc
-title: Create a doc
 description: Create a Markdown Document
 slug: /create-doc
 ---
 
+# Create a doc
+
 Create a Markdown file, `greeting.md`, and place it under the `docs` directory.
 
 ```bash
diff --git a/website/docs/guides/docs/docs-introduction.md b/website/docs/guides/docs/docs-introduction.md
index 02e9d76b45cd..885a1e6720f7 100644
--- a/website/docs/guides/docs/docs-introduction.md
+++ b/website/docs/guides/docs/docs-introduction.md
@@ -1,10 +1,11 @@
 ---
 id: introduction
-title: Docs Introduction
 sidebar_label: Introduction
 slug: /docs-introduction
 ---
 
+# Docs Introduction
+
 The docs feature provides users with a way to organize Markdown files in a hierarchical format.
 
 :::info
diff --git a/website/docs/guides/docs/docs-multi-instance.mdx b/website/docs/guides/docs/docs-multi-instance.mdx
index 1ab708b4c937..0f267fcbe174 100644
--- a/website/docs/guides/docs/docs-multi-instance.mdx
+++ b/website/docs/guides/docs/docs-multi-instance.mdx
@@ -1,10 +1,11 @@
 ---
 id: multi-instance
-title: Docs Multi-instance
 description: Use multiple docs plugin instances on a single Docusaurus site.
 slug: /docs-multi-instance
 ---
 
+# Docs Multi-instance
+
 The `@docusaurus/plugin-content-docs` plugin can support [multi-instance](../../using-plugins.md#multi-instance-plugins-and-plugin-ids).
 
 :::note
diff --git a/website/docs/guides/docs/versioning.md b/website/docs/guides/docs/versioning.md
index e27512e083a6..082b6ffb3d51 100644
--- a/website/docs/guides/docs/versioning.md
+++ b/website/docs/guides/docs/versioning.md
@@ -1,16 +1,16 @@
 ---
-id: versioning
-title: Versioning
 slug: /versioning
 ---
 
+# Versioning
+
+You can use the versioning CLI to create a new documentation version based on the latest content in the `docs` directory. That specific set of documentation will then be preserved and accessible even as the documentation in the `docs` directory continues to evolve.
+
 ```mdx-code-block
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 ```
 
-You can use the version script to create a new documentation version based on the latest content in the `docs` directory. That specific set of documentation will then be preserved and accessible even as the documentation in the `docs` directory changes moving forward.
-
 :::caution
 
 Think about it before starting to version your documentation - it can become difficult for contributors to help improve it!
diff --git a/website/docs/guides/markdown-features/markdown-features-admonitions.mdx b/website/docs/guides/markdown-features/markdown-features-admonitions.mdx
index 3302ee532661..a864fe0d4f50 100644
--- a/website/docs/guides/markdown-features/markdown-features-admonitions.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-admonitions.mdx
@@ -1,10 +1,11 @@
 ---
 id: admonitions
-title: Admonitions
 description: Handling admonitions/callouts in Docusaurus Markdown
 slug: /markdown-features/admonitions
 ---
 
+# Admonitions
+
 import BrowserWindow from '@site/src/components/BrowserWindow';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/website/docs/guides/markdown-features/markdown-features-assets.mdx b/website/docs/guides/markdown-features/markdown-features-assets.mdx
index 321ddb5d9ad2..c4ba65dfa6e2 100644
--- a/website/docs/guides/markdown-features/markdown-features-assets.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-assets.mdx
@@ -1,10 +1,11 @@
 ---
 id: assets
-title: Assets
 description: Handling assets in Docusaurus Markdown
 slug: /markdown-features/assets
 ---
 
+# Assets
+
 import BrowserWindow from '@site/src/components/BrowserWindow';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx b/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
index ff817c1c952a..3661393dea7e 100644
--- a/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
@@ -1,10 +1,11 @@
 ---
 id: code-blocks
-title: Code blocks
 description: Handling code blocks in Docusaurus Markdown
 slug: /markdown-features/code-blocks
 ---
 
+# Code blocks
+
 import BrowserWindow from '@site/src/components/BrowserWindow';
 import CodeBlock from '@theme/CodeBlock';
 
diff --git a/website/docs/guides/markdown-features/markdown-features-head-metadata.mdx b/website/docs/guides/markdown-features/markdown-features-head-metadata.mdx
index 66fd5748c5e9..8d4669505bf9 100644
--- a/website/docs/guides/markdown-features/markdown-features-head-metadata.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-head-metadata.mdx
@@ -1,6 +1,5 @@
 ---
 id: head-metadata
-title: Head Metadata
 description: Declaring page-specific head metadata through MDX
 slug: /markdown-features/head-metadata
 ---
diff --git a/website/docs/guides/markdown-features/markdown-features-intro.mdx b/website/docs/guides/markdown-features/markdown-features-intro.mdx
index afefc966a2ed..5ba73bbf6d6d 100644
--- a/website/docs/guides/markdown-features/markdown-features-intro.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-intro.mdx
@@ -1,11 +1,11 @@
 ---
 id: introduction
-title: Markdown Features
-sidebar_label: Introduction
 description: Docusaurus uses MDX. Find out more about Docusaurus-specific features when writing Markdown.
 slug: /markdown-features
 ---
 
+# Markdown Features
+
 import BrowserWindow from '@site/src/components/BrowserWindow';
 
 Documentation is one of your product's interfaces with your users. A well-written and well-organized set of docs helps your users understand your product quickly. Our aligned goal here is to help your users find and understand the information they need, as quickly as possible.
diff --git a/website/docs/guides/markdown-features/markdown-features-math-equations.mdx b/website/docs/guides/markdown-features/markdown-features-math-equations.mdx
index e3281d6fd6ad..1f6e32282518 100644
--- a/website/docs/guides/markdown-features/markdown-features-math-equations.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-math-equations.mdx
@@ -1,10 +1,11 @@
 ---
 id: math-equations
-title: Math Equations
 description: Writing LaTeX Math Equations
 slug: /markdown-features/math-equations
 ---
 
+# Math Equations
+
 import BrowserWindow from '@site/src/components/BrowserWindow';
 
 Mathematical equations can be rendered using [KaTeX](https://katex.org).
diff --git a/website/docs/guides/markdown-features/markdown-features-plugins.mdx b/website/docs/guides/markdown-features/markdown-features-plugins.mdx
index 7c78af39d8e8..6a7a3629c106 100644
--- a/website/docs/guides/markdown-features/markdown-features-plugins.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-plugins.mdx
@@ -1,10 +1,11 @@
 ---
 id: plugins
-title: MDX Plugins
 description: Using MDX plugins to expand Docusaurus Markdown functionalities
 slug: /markdown-features/plugins
 ---
 
+# MDX Plugins
+
 Sometimes, you may want to extend or tweak your Markdown syntax. For example:
 
 - How do I embed youtube videos using the image syntax (`![](https://youtu.be/yKNxeF4KMsY)`)?
diff --git a/website/docs/guides/markdown-features/markdown-features-react.mdx b/website/docs/guides/markdown-features/markdown-features-react.mdx
index ca1588df16b1..0a3e31ba6dd4 100644
--- a/website/docs/guides/markdown-features/markdown-features-react.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-react.mdx
@@ -1,6 +1,5 @@
 ---
 id: react
-title: MDX and React
 description: Using the power of React in Docusaurus Markdown documents, thanks to MDX
 slug: /markdown-features/react
 ---
diff --git a/website/docs/guides/markdown-features/markdown-features-tabs.mdx b/website/docs/guides/markdown-features/markdown-features-tabs.mdx
index 40987d28e479..897f54a8a7c0 100644
--- a/website/docs/guides/markdown-features/markdown-features-tabs.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-tabs.mdx
@@ -1,10 +1,11 @@
 ---
 id: tabs
-title: Tabs
 description: Using tabs inside Docusaurus Markdown
 slug: /markdown-features/tabs
 ---
 
+# Tabs
+
 ```mdx-code-block
 import BrowserWindow from '@site/src/components/BrowserWindow';
 import Tabs from '@theme/Tabs';
diff --git a/website/docs/i18n/i18n-crowdin.mdx b/website/docs/i18n/i18n-crowdin.mdx
index 60afe1f10b22..c7f0ca21930b 100644
--- a/website/docs/i18n/i18n-crowdin.mdx
+++ b/website/docs/i18n/i18n-crowdin.mdx
@@ -1,10 +1,11 @@
 ---
 id: crowdin
-title: i18n - Using Crowdin
 slug: /i18n/crowdin
 toc_max_heading_level: 4
 ---
 
+# i18n - Using Crowdin
+
 The i18n system of Docusaurus is **decoupled from any translation software**.
 
 You can integrate Docusaurus with the **tools and SaaS of your choice**, as long as you put the **translation files at the correct location**.
diff --git a/website/docs/i18n/i18n-git.md b/website/docs/i18n/i18n-git.md
index 12c8f157995f..18f3094aa262 100644
--- a/website/docs/i18n/i18n-git.md
+++ b/website/docs/i18n/i18n-git.md
@@ -1,9 +1,10 @@
 ---
 id: git
-title: i18n - Using git
 slug: /i18n/git
 ---
 
+# i18n - Using git
+
 A **possible translation strategy** is to **version control the translation files** with Git (or any other [VCS](https://en.wikipedia.org/wiki/Version_control)).
 
 ## Tradeoffs {#tradeoffs}
diff --git a/website/docs/i18n/i18n-introduction.md b/website/docs/i18n/i18n-introduction.md
index 610e8304175d..3cfa077af6f2 100644
--- a/website/docs/i18n/i18n-introduction.md
+++ b/website/docs/i18n/i18n-introduction.md
@@ -1,9 +1,10 @@
 ---
 id: introduction
-title: i18n - Introduction
 slug: /i18n/introduction
 ---
 
+# i18n - Introduction
+
 It is **easy to translate a Docusaurus website** with its internationalization ([i18n](https://en.wikipedia.org/wiki/Internationalization_and_localization)) support.
 
 ## Goals {#goals}
diff --git a/website/docs/i18n/i18n-tutorial.md b/website/docs/i18n/i18n-tutorial.md
index c8e051ab3258..d04b61744bec 100644
--- a/website/docs/i18n/i18n-tutorial.md
+++ b/website/docs/i18n/i18n-tutorial.md
@@ -1,9 +1,11 @@
 ---
 id: tutorial
-title: i18n - Tutorial
+description: This tutorial will walk you through the basics of the Docusaurus i18n system.
 slug: /i18n/tutorial
 ---
 
+# i18n - Tutorial
+
 ```mdx-code-block
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/website/docs/installation.md b/website/docs/installation.md
index 92576624eec1..442d758f7d18 100644
--- a/website/docs/installation.md
+++ b/website/docs/installation.md
@@ -1,8 +1,9 @@
 ---
-id: installation
-title: Installation
+description: How to install Docusaurus locally, and start a Docusaurus site in no time.
 ---
 
+# Installation
+
 ```mdx-code-block
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
diff --git a/website/docs/introduction.md b/website/docs/introduction.md
index cec5f22c2e08..c5f4d0106f42 100644
--- a/website/docs/introduction.md
+++ b/website/docs/introduction.md
@@ -1,10 +1,10 @@
 ---
-id: introduction
-title: Introduction
 description: Docusaurus was designed from the ground up to be easily installed and used to get your website up and running quickly.
 slug: /
 ---
 
+# Introduction
+
 ⚡️ Docusaurus will help you ship a **beautiful documentation site in no time**.
 
 💸 Building a custom tech stack is expensive. Instead, **focus on your content** and just write Markdown files.
diff --git a/website/docs/migration/migration-automated.md b/website/docs/migration/migration-automated.md
index a4422db65d1e..65f95cfdaf5a 100644
--- a/website/docs/migration/migration-automated.md
+++ b/website/docs/migration/migration-automated.md
@@ -1,9 +1,9 @@
 ---
-id: migration-automated
-title: Automated migration
 slug: /migration/automated
 ---
 
+# Automated migration
+
 The migration CLI automatically migrates your v1 website to a v2 website.
 
 :::info
diff --git a/website/docs/migration/migration-manual.md b/website/docs/migration/migration-manual.md
index a10451db78a2..aa641852976a 100644
--- a/website/docs/migration/migration-manual.md
+++ b/website/docs/migration/migration-manual.md
@@ -1,10 +1,10 @@
 ---
-id: migration-manual
-title: Manual migration
 slug: /migration/manual
 toc_max_heading_level: 4
 ---
 
+# Manual migration
+
 This manual migration process should be run after the [automated migration process](./migration-automated.md), to complete the missing parts, or debug issues in the migration CLI output.
 
 ## Project setup {#project-setup}
diff --git a/website/docs/migration/migration-overview.md b/website/docs/migration/migration-overview.md
index 14e9b967694c..efed50c1acd8 100644
--- a/website/docs/migration/migration-overview.md
+++ b/website/docs/migration/migration-overview.md
@@ -1,9 +1,9 @@
 ---
-id: migration-overview
-title: Migration overview
 slug: /migration
 ---
 
+# Migration overview
+
 This doc guides you through migrating an existing Docusaurus 1 site to Docusaurus 2.
 
 We try to make this as easy as possible, and provide a migration cli.
diff --git a/website/docs/migration/migration-translated-sites.md b/website/docs/migration/migration-translated-sites.md
index 9403f86c6de4..9964943f16e2 100644
--- a/website/docs/migration/migration-translated-sites.md
+++ b/website/docs/migration/migration-translated-sites.md
@@ -1,9 +1,9 @@
 ---
-id: migration-translated-sites
-title: Translated sites
 slug: /migration/translated-sites
 ---
 
+# Translated sites
+
 This page explains how migrate a translated Docusaurus v1 site to Docusaurus v2.
 
 ## i18n differences {#i18n-differences}
diff --git a/website/docs/migration/migration-versioned-sites.md b/website/docs/migration/migration-versioned-sites.md
index 98eae9ef20ea..e21dc802fb06 100644
--- a/website/docs/migration/migration-versioned-sites.md
+++ b/website/docs/migration/migration-versioned-sites.md
@@ -1,9 +1,9 @@
 ---
-id: migration-versioned-sites
-title: Versioned sites
 slug: /migration/versioned-sites
 ---
 
+# Versioned sites
+
 Read up https://docusaurus.io/blog/2018/09/11/Towards-Docusaurus-2#versioning first for problems in v1's approach.
 
 :::note
diff --git a/website/docs/search.md b/website/docs/search.md
index d3b27ec96cab..e00e022cfaca 100644
--- a/website/docs/search.md
+++ b/website/docs/search.md
@@ -1,11 +1,11 @@
 ---
-id: search
-title: Search
 keywords:
   - algolia
   - search
 ---
 
+# Search
+
 There are a few options you can use to add search to your website:
 
 - 🥇 [Algolia DocSearch](#using-algolia-docsearch) (**official**)
diff --git a/website/docs/seo.md b/website/docs/seo.md
index 3c61f7fae51b..578bb7761c30 100644
--- a/website/docs/seo.md
+++ b/website/docs/seo.md
@@ -1,12 +1,13 @@
 ---
-id: seo
-title: Search engine optimization (SEO)
+description: How to make your Docusaurus site maximally search-engine-friendly.
 sidebar_label: SEO
 keywords:
   - seo
   - positioning
 ---
 
+# Search engine optimization (SEO)
+
 import BrowserWindow from '@site/src/components/BrowserWindow';
 
 Docusaurus supports search engine optimization in a variety of ways.
diff --git a/website/docs/static-assets.md b/website/docs/static-assets.md
index ec2660c42d75..08fbacb9e58e 100644
--- a/website/docs/static-assets.md
+++ b/website/docs/static-assets.md
@@ -1,11 +1,12 @@
 ---
-id: static-assets
-title: Static Assets
+description: Static assets are the non-code files that are directly copied to the build output. Learn about how they are handled and what the best practices of using static assets are.
 ---
 
-Every website needs assets: images, stylesheets, favicons, etc. By default, you are suggested to put these assets in the `static` folder.
+# Static Assets
 
-Every file you put into **that directory will be copied** into the root of the generated `build` folder with the directory hierarchy preserved. E.g. if you add a file named `sun.jpg` to the static folder, it will be copied to `build/sun.jpg`.
+Static assets are the non-code files that are directly copied to the build output. They include images, stylesheets, favicons, fonts, etc.
+
+By default, you are suggested to put these assets in the `static` folder. Every file you put into **that directory will be copied** into the root of the generated `build` folder with the directory hierarchy preserved. E.g. if you add a file named `sun.jpg` to the static folder, it will be copied to `build/sun.jpg`.
 
 This means that:
 
diff --git a/website/docs/styling-layout.md b/website/docs/styling-layout.md
index b6cba21b2e5d..b9cee786b711 100644
--- a/website/docs/styling-layout.md
+++ b/website/docs/styling-layout.md
@@ -1,11 +1,11 @@
 ---
-id: styling-layout
-title: Styling and Layout
 description: A Docusaurus site is a pre-rendered single-page React application. You can style it the way you style React apps.
 ---
 
 import ColorGenerator from '@site/src/components/ColorGenerator';
 
+# Styling and Layout
+
 :::tip
 
 This section is focused on styling through stylesheets. For more advanced customizations (DOM structure, React code...), refer to the [swizzling guide](./swizzling.md).
diff --git a/website/docs/typescript-support.md b/website/docs/typescript-support.md
index 8bd87a1f8960..c8d7c117c6e5 100644
--- a/website/docs/typescript-support.md
+++ b/website/docs/typescript-support.md
@@ -1,8 +1,9 @@
 ---
-id: typescript-support
-title: TypeScript Support
+description: Docusaurus is written in TypeScript and provides first-class TypeScript support.
 ---
 
+# TypeScript Support
+
 Docusaurus is written in TypeScript and provides first-class TypeScript support.
 
 ## Initialization {#initialization}

From f40dc3138105cfbe56d02b1f2a43daec9128f472 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Sat, 28 May 2022 21:24:01 +0800
Subject: [PATCH 31/43] docs: multiple documentation elaborations (#7519)

---
 website/docs/advanced/ssg.md                  |   4 +-
 website/docs/api/docusaurus.config.js.md      |  10 +-
 website/docs/blog.mdx                         |   2 +-
 website/docs/guides/docs/docs-create-doc.mdx  | 132 ++++++++++++------
 website/docs/guides/docs/docs-introduction.md |  74 +---------
 .../markdown-features-intro.mdx               |  16 +++
 6 files changed, 123 insertions(+), 115 deletions(-)

diff --git a/website/docs/advanced/ssg.md b/website/docs/advanced/ssg.md
index 0a394f9179b4..dbd104d78a95 100644
--- a/website/docs/advanced/ssg.md
+++ b/website/docs/advanced/ssg.md
@@ -8,12 +8,14 @@ description: Docusaurus statically renders your React code into HTML, allowing f
 In [architecture](architecture.md), we mentioned that the theme is run in Webpack. But beware: that doesn't mean it always has access to browser globals! The theme is built twice:
 
 - During **server-side rendering**, the theme is compiled in a sandbox called [React DOM Server](https://reactjs.org/docs/react-dom-server.html). You can see this as a "headless browser", where there is no `window` or `document`, only React. SSR produces static HTML pages.
-- During **client-side rendering**, the theme is compiled with standard React DOM, and has access to browser variables. CSR produces dynamic JavaScript.
+- During **client-side rendering**, the theme is compiled to JavaScript that gets eventually executed in the browser, so it has access to browser variables.
 
 :::info SSR or SSG?
 
 _Server-side rendering_ and _static site generation_ can be different concepts, but we use them interchangeably.
 
+Strictly speaking, Docusaurus is a static site generator, because there's no server-side runtime—we statically render to HTML files that are deployed on a CDN, instead of dynamically pre-rendering on each request. This differs from the working model of [Next.js](https://nextjs.org/).
+
 :::
 
 Therefore, while you probably know not to access Node globals like `process` ([or can we?](#node-env)) or the `'fs'` module, you can't freely access browser globals either.
diff --git a/website/docs/api/docusaurus.config.js.md b/website/docs/api/docusaurus.config.js.md
index d20d29d34c76..0b0a6ecf8832 100644
--- a/website/docs/api/docusaurus.config.js.md
+++ b/website/docs/api/docusaurus.config.js.md
@@ -425,7 +425,7 @@ module.exports = {
 
 ### `scripts` {#scripts}
 
-An array of scripts to load. The values can be either strings or plain objects of attribute-value maps. The `<script>` tags will be inserted in the HTML `<head>`.
+An array of scripts to load. The values can be either strings or plain objects of attribute-value maps. The `<script>` tags will be inserted in the HTML `<head>`. If you use a plain object, the only required attribute is `src`, and any other attributes are permitted (each one should have boolean/string values).
 
 Note that `<script>` added here are render-blocking, so you might want to add `async: true`/`defer: true` to the objects.
 
@@ -449,7 +449,7 @@ module.exports = {
 
 ### `stylesheets` {#stylesheets}
 
-An array of CSS sources to load. The values can be either strings or plain objects of attribute-value maps. The `<link>` tags will be inserted in the HTML `<head>`.
+An array of CSS sources to load. The values can be either strings or plain objects of attribute-value maps. The `<link>` tags will be inserted in the HTML `<head>`. If you use an object, the only required attribute is `href`, and any other attributes are permitted (each one should have boolean/string values).
 
 - Type: `(string | Object)[]`
 
@@ -468,6 +468,12 @@ module.exports = {
 };
 ```
 
+:::info
+
+By default, the `<link>` tags will have `rel="stylesheet"`, but you can explicitly add a custom `rel` value to inject any kind of `<link>` tag, not necessarily stylesheets.
+
+:::
+
 ### `clientModules` {#clientModules}
 
 An array of [client modules](../advanced/client.md#client-modules) to load globally on your site.
diff --git a/website/docs/blog.mdx b/website/docs/blog.mdx
index 25bd18f60a8e..26ef286377b6 100644
--- a/website/docs/blog.mdx
+++ b/website/docs/blog.mdx
@@ -70,7 +70,7 @@ This is my first post on Docusaurus 2.
 A whole bunch of exploration to follow.
 ```
 
-The front matter is useful to add more metadata to your blog post, for example, author information, but Docusaurus will be able to infer all necessary metadata without the front matter. For all possible fields, see [the API documentation](api/plugins/plugin-content-blog.md#markdown-front-matter).
+The [front matter](./guides/markdown-features/markdown-features-intro.mdx#front-matter) is useful to add more metadata to your blog post, for example, author information, but Docusaurus will be able to infer all necessary metadata without the front matter. For all possible fields, see [the API documentation](api/plugins/plugin-content-blog.md#markdown-front-matter).
 
 ## Blog list {#blog-list}
 
diff --git a/website/docs/guides/docs/docs-create-doc.mdx b/website/docs/guides/docs/docs-create-doc.mdx
index baf451a96a0f..c683f2894e74 100644
--- a/website/docs/guides/docs/docs-create-doc.mdx
+++ b/website/docs/guides/docs/docs-create-doc.mdx
@@ -18,25 +18,22 @@ website # root directory of your site
 ├── ...
 ```
 
-At the top of the file, specify `id` and `title` in the front matter, so that Docusaurus will pick them up correctly when generating your site.
-
 ```md
 ---
-id: greeting
-title: Hello
+description: Create a doc page with rich content.
 ---
 
-## Hello from Docusaurus
+# Hello from Docusaurus
 
 Are you ready to create the documentation site for your open source project?
 
-### Headers
+## Headers
 
 will show up on the table of contents on the upper right
 
 So that your users will know what this page is all about without scrolling down or even without reading too much.
 
-### Only h2 and h3 will be in the TOC by default.
+## Only h2 and h3 will be in the TOC by default.
 
 You can configure the TOC heading levels either per-document or in the theme configuration.
 
@@ -48,73 +45,122 @@ The headers are well-spaced so that the hierarchy is clear.
   - and you may nest them
     - multiple times
 
-### Custom id headers {#custom-id}
+## Custom id headers {#custom-id}
 
 With `{#custom-id}` syntax you can set your own header id.
 ```
 
-This will render in the browser as follows:
+:::note
 
-```mdx-code-block
-import BrowserWindow from '@site/src/components/BrowserWindow';
+All files prefixed with an underscore (`_`) under the `docs` directory are treated as "partial" pages and will be ignored by default.
 
-<BrowserWindow>
+Read more about [importing partial pages](../markdown-features/markdown-features-react.mdx#importing-markdown).
 
-<h2>Hello from Docusaurus</h2>
+:::
 
-Are you ready to create the documentation site for your open source project?
+## Doc front matter {#doc-front-matter}
 
-<h3>Headers</h3>
+The [front matter](../markdown-features/markdown-features-intro.mdx#front-matter) is used to provide additional metadata for your doc page. Front matter is optional—Docusaurus will be able to infer all necessary metadata without the front matter. For example, the [doc tags](#dog-tags) feature introduced below requires using front matter. For all possible fields, see [the API documentation](../../api/plugins/plugin-content-docs.md#markdown-front-matter).
 
-will show up on the table of contents on the upper right
+## Doc tags {#doc-tags}
 
-So that your users will know what this page is all about without scrolling down or even without reading too much.
+Optionally, you can add tags to your doc pages, which introduces another dimension of categorization in addition to the [docs sidebar](./sidebar/index.md). Tags are passed in the front matter as a list of labels:
+
+```md "your-doc-page.md"
+---
+id: doc-with-tags
+title: A doc with tags
+tags:
+  - Demo
+  - Getting started
+---
+```
 
-<h3>Only h2 and h3 will be in the TOC by default.</h3>
+:::tip
 
-You can configure the TOC heading levels either per document or in the theme configuration.
+Tags can also be declared with `tags: [Demo, Getting started]`.
 
-The headers are well-spaced so that the hierarchy is clear.
+Read more about all the possible [Yaml array syntaxes](https://www.w3schools.io/file/yaml-arrays/).
 
-- lists will help you
-- present the key points
-- that you want your users to remember
-  - and you may nest them
-    - multiple times
+:::
+
+## Organizing folder structure {#organizing-folder-structure}
+
+How the Markdown files are arranged under the `docs` folder can have multiple impacts on Docusaurus content generation. However, most of them can be decoupled from the file structure.
 
-<h3 id="custom-id">Custom id headers</h3>
+### Document ID {#document-id}
 
-With <code>{#custom-id}</code> syntax you can set your own header id.
+Every document has a unique `id`. By default, a document `id` is the name of the document (without the extension) relative to the root docs directory.
 
-</BrowserWindow>
+For example, `greeting.md` id is `greeting` and `guide/hello.md` id is `guide/hello`.
+
+```bash
+website # Root directory of your site
+└── docs
+   ├── greeting.md
+   └── guide
+      └── hello.md
 ```
 
-:::note
+However, the **last part** of the `id` can be defined by the user in the front matter. For example, if `guide/hello.md`'s content is defined as below, its final `id` is `guide/part1`.
 
-All files prefixed with an underscore (`_`) under the `docs` directory are treated as "partial" pages and will be ignored by default.
+```md
+---
+id: part1
+---
 
-Read more about [importing partial pages](../markdown-features/markdown-features-react.mdx#importing-markdown).
+Lorem ipsum
+```
 
-:::
+The ID is used to refer to a document when hand-writing sidebars, or when using docs-related layout components or hooks.
 
-## Doc tags {#doc-tags}
+### Doc URLs {#doc-urls}
 
-Optionally, you can add tags to your doc pages, which introduces another dimension of categorization in addition to the [docs sidebar](./sidebar/index.md). Tags are passed in the front matter as a list of labels:
+By default, a document's URL location is its file path relative to the `docs` folder. Use the `slug` front matter to change a document's URL.
 
-```md "your-doc-page.md"
+For example, suppose your site structure looks like this:
+
+```bash
+website # Root directory of your site
+└── docs
+    └── guide
+        └── hello.md
+```
+
+By default `hello.md` will be available at `/docs/guide/hello`. You can change its URL location to `/docs/bonjour`:
+
+```md
 ---
-id: doc-with-tags
-title: A doc with tags
-tags:
-  - Demo
-  - Getting started
+slug: /bonjour
 ---
+
+Lorem ipsum
 ```
 
-:::tip
+`slug` will be appended to the doc plugin's `routeBasePath`, which is `/docs` by default. See [Docs-only mode](#docs-only-mode) for how to remove the `/docs` part from the URL.
 
-Tags can also be declared with `tags: [Demo, Getting started]`.
+:::note
 
-Read more about all the possible [Yaml array syntaxes](https://www.w3schools.io/file/yaml-arrays/).
+It is possible to use:
+
+- absolute slugs: `slug: /mySlug`, `slug: /`...
+- relative slugs: `slug: mySlug`, `slug: ./../mySlug`...
 
 :::
+
+If you want a document to be available at the root, and have a path like `https://docusaurus.io/docs/`, you can use the slug front matter:
+
+```md
+---
+id: my-home-doc
+slug: /
+---
+
+Lorem ipsum
+```
+
+### Sidebars {#sidebars}
+
+When using [autogenerated sidebars](./sidebar/autogenerated.md), the file structure will determine the sidebar structure.
+
+Our recommendation for file system organization is: make your file system mirror the sidebar structure (so you don't need to handwrite your `sidebars.js` file), and use the `slug` front matter to customize URLs of each document.
diff --git a/website/docs/guides/docs/docs-introduction.md b/website/docs/guides/docs/docs-introduction.md
index 885a1e6720f7..7aa09d0dd05b 100644
--- a/website/docs/guides/docs/docs-introduction.md
+++ b/website/docs/guides/docs/docs-introduction.md
@@ -14,76 +14,14 @@ Check the [Docs Plugin API Reference documentation](./../../api/plugins/plugin-c
 
 :::
 
-## Document ID {#document-id}
+Your site's documentation is organized by four levels, from lowest to highest:
 
-Every document has a unique `id`. By default, a document `id` is the name of the document (without the extension) relative to the root docs directory.
+1. Individual pages.
+2. Sidebars.
+3. Versions.
+4. Plugin instances.
 
-For example, `greeting.md` id is `greeting` and `guide/hello.md` id is `guide/hello`.
-
-```bash
-website # Root directory of your site
-└── docs
-   ├── greeting.md
-   └── guide
-      └── hello.md
-```
-
-However, the **last part** of the `id` can be defined by the user in the front matter. For example, if `guide/hello.md`'s content is defined as below, its final `id` is `guide/part1`.
-
-```md
----
-id: part1
----
-
-Lorem ipsum
-```
-
-### Customizing doc URLs {#customizing-doc-urls}
-
-By default, a document's URL location is its file path relative to the `docs` folder. Use the `slug` front matter to change a document's URL.
-
-For example, suppose your site structure looks like this:
-
-```bash
-website # Root directory of your site
-└── docs
-    └── guide
-        └── hello.md
-```
-
-By default `hello.md` will be available at `/docs/guide/hello`. You can change its URL location to `/docs/bonjour`:
-
-```md
----
-slug: /bonjour
----
-
-Lorem ipsum
-```
-
-`slug` will be appended to the doc plugin's `routeBasePath`, which is `/docs` by default. See [Docs-only mode](#docs-only-mode) for how to remove the `/docs` part from the URL.
-
-:::note
-
-It is possible to use:
-
-- absolute slugs: `slug: /mySlug`, `slug: /`...
-- relative slugs: `slug: mySlug`, `slug: ./../mySlug`...
-
-:::
-
-## Home page docs {#home-page-docs}
-
-If you want a document to be available at the root, and have a path like `https://docusaurus.io/docs/`, you can use the slug front matter:
-
-```md
----
-id: my-home-doc
-slug: /
----
-
-Lorem ipsum
-```
+The guide will introduce them in that order: starting from [how individual pages can be configured](./docs-create-doc.mdx), to [how to create a sidebar or multiple ones](./sidebar/index.md), to [how to create and manage versions](./versioning.md), to [how to use multiple docs plugin instances](./docs-multi-instance.mdx).
 
 ## Docs-only mode {#docs-only-mode}
 
diff --git a/website/docs/guides/markdown-features/markdown-features-intro.mdx b/website/docs/guides/markdown-features/markdown-features-intro.mdx
index 5ba73bbf6d6d..7b56a3765057 100644
--- a/website/docs/guides/markdown-features/markdown-features-intro.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-intro.mdx
@@ -56,6 +56,22 @@ In general, you should only assume the _semantics_ of the markup (` ``` ` fences
 
 </details>
 
+## Front matter {#front-matter}
+
+Front matter is used to add metadata to your Markdown file. All content plugins have their own front matter schema, and use the front matter to enrich the default metadata inferred from the content or other configuration.
+
+Front matter is provided at the very top of the file, enclosed by three dashes `---`. The content is parsed as [YAML](https://yaml.org/spec/1.2.2/).
+
+```md
+---
+title: My Doc Title
+more_data:
+  - Can be provided
+  - as: objects
+    or: arrays
+---
+```
+
 ## Quotes {#quotes}
 
 Markdown quotes are beautifully styled:

From 8b1acb50d1f860ac70087a244a84f60d2ea4098f Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Sat, 28 May 2022 23:52:05 +0800
Subject: [PATCH 32/43] fix: make type-checking pass in Yarn PnP (#7521)

* fix: make type-checking pass in Yarn PnP

* fix

* fix?

* fix...

* almost there

* try again

* little fix

* disable
---
 .github/workflows/tests-e2e.yml                   | 15 +++++++++------
 packages/docusaurus-mdx-loader/package.json       |  1 +
 packages/docusaurus-mdx-loader/tsconfig.json      |  3 ++-
 .../docusaurus-module-type-aliases/package.json   |  5 ++++-
 .../docusaurus-plugin-content-blog/package.json   |  1 +
 .../docusaurus-plugin-content-docs/package.json   |  7 ++++---
 .../docusaurus-plugin-content-pages/package.json  |  1 +
 packages/docusaurus-plugin-debug/package.json     |  1 +
 .../package.json                                  |  1 +
 .../docusaurus-plugin-google-gtag/package.json    |  1 +
 .../docusaurus-plugin-ideal-image/package.json    |  1 +
 packages/docusaurus-plugin-pwa/package.json       |  1 +
 packages/docusaurus-plugin-sitemap/package.json   |  1 +
 packages/docusaurus-preset-classic/package.json   |  3 ++-
 packages/docusaurus-theme-classic/package.json    |  6 +++++-
 packages/docusaurus-theme-common/package.json     |  5 +++++
 packages/docusaurus-types/package.json            |  2 +-
 packages/docusaurus-utils-common/package.json     |  9 +++++++--
 packages/docusaurus-utils/package.json            |  8 ++++++++
 19 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml
index 92b9f5319f84..ef3e2d103474 100644
--- a/.github/workflows/tests-e2e.yml
+++ b/.github/workflows/tests-e2e.yml
@@ -64,11 +64,6 @@ jobs:
       matrix:
         nodeLinker: [pnp, node-modules]
         variant: [-s, -st]
-        exclude:
-          # Running tsc on PnP requires additional installations, which is not
-          # worthwhile for a simple E2E test
-          - variant: -st
-            nodeLinker: pnp
     steps:
       - name: Checkout
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # v3
@@ -98,13 +93,21 @@ jobs:
         working-directory: ../test-website
         env:
           YARN_ENABLE_IMMUTABLE_INSTALLS: false # Yarn berry should create the lockfile, despite CI env
+      - name: Install missing dependencies
+        if: matrix.variant == '-st' && matrix.nodeLinker == 'pnp'
+        run: |
+          # These dependencies are referenced in the init project, not by our packages
+          yarn add @docusaurus/theme-classic @docusaurus/types @types/node
+          yarn config set packageExtensions --json '{ "unified@^9.2.2": { "dependencies": { "@types/unist": "^2.0.6" } } }'
+        working-directory: ../test-website
       - name: Start test-website project
         run: yarn start --no-open
         working-directory: ../test-website
         env:
           E2E_TEST: true
       - name: Type check
-        if: matrix.variant == '-st'
+        # TODO: there're some lingering issues with PnP + tsc. Enable tsc in PnP later.
+        if: matrix.variant == '-st' && matrix.nodeLinker != 'pnp'
         run: yarn typecheck
         working-directory: ../test-website
       - name: Build test-website project
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
index 47e40510dafe..1efcee5eaf0e 100644
--- a/packages/docusaurus-mdx-loader/package.json
+++ b/packages/docusaurus-mdx-loader/package.json
@@ -31,6 +31,7 @@
     "remark-emoji": "^2.2.0",
     "stringify-object": "^3.3.0",
     "tslib": "^2.4.0",
+    "unified": "^9.2.2",
     "unist-util-visit": "^2.0.3",
     "url-loader": "^4.1.1",
     "webpack": "^5.72.1"
diff --git a/packages/docusaurus-mdx-loader/tsconfig.json b/packages/docusaurus-mdx-loader/tsconfig.json
index 7807612b51a5..3cdfe2a88c91 100644
--- a/packages/docusaurus-mdx-loader/tsconfig.json
+++ b/packages/docusaurus-mdx-loader/tsconfig.json
@@ -8,7 +8,8 @@
     "declarationMap": true,
     "module": "commonjs",
     "rootDir": "src",
-    "outDir": "lib"
+    "outDir": "lib",
+    "types": []
   },
   "include": ["src"],
   "exclude": ["**/__tests__/**"]
diff --git a/packages/docusaurus-module-type-aliases/package.json b/packages/docusaurus-module-type-aliases/package.json
index 3c9d3d4f2eba..26d08a22247a 100644
--- a/packages/docusaurus-module-type-aliases/package.json
+++ b/packages/docusaurus-module-type-aliases/package.json
@@ -12,11 +12,14 @@
     "directory": "packages/docusaurus-module-type-aliases"
   },
   "dependencies": {
+    "@docusaurus/react-loadable": "5.5.2",
     "@docusaurus/types": "2.0.0-beta.21",
+    "@types/history": "^4.7.11",
     "@types/react": "*",
     "@types/react-router-config": "*",
     "@types/react-router-dom": "*",
-    "react-helmet-async": "*"
+    "react-helmet-async": "*",
+    "react-loadable": "npm:@docusaurus/react-loadable@5.5.2"
   },
   "peerDependencies": {
     "react": "*",
diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json
index 8f24c3cfc14d..f5bfcff31857 100644
--- a/packages/docusaurus-plugin-content-blog/package.json
+++ b/packages/docusaurus-plugin-content-blog/package.json
@@ -21,6 +21,7 @@
     "@docusaurus/core": "2.0.0-beta.21",
     "@docusaurus/logger": "2.0.0-beta.21",
     "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-common": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index b93c676daf14..bc6a154f51b4 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -28,8 +28,11 @@
     "@docusaurus/core": "2.0.0-beta.21",
     "@docusaurus/logger": "2.0.0-beta.21",
     "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
+    "@types/react-router-config": "^5.0.6",
     "combine-promises": "^1.1.0",
     "fs-extra": "^10.1.0",
     "import-fresh": "^3.3.0",
@@ -41,15 +44,13 @@
     "webpack": "^5.72.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "@docusaurus/types": "2.0.0-beta.21",
     "@types/js-yaml": "^4.0.5",
     "@types/picomatch": "^2.3.0",
     "commander": "^5.1.0",
     "escape-string-regexp": "^4.0.0",
     "picomatch": "^2.3.1",
-    "shelljs": "^0.8.5",
-    "utility-types": "^3.10.0"
+    "shelljs": "^0.8.5"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json
index 8ea086319ad5..c9167e386d3a 100644
--- a/packages/docusaurus-plugin-content-pages/package.json
+++ b/packages/docusaurus-plugin-content-pages/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
     "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
     "fs-extra": "^10.1.0",
diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json
index 1c67b206460f..d9e1cb136ad8 100644
--- a/packages/docusaurus-plugin-debug/package.json
+++ b/packages/docusaurus-plugin-debug/package.json
@@ -21,6 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "fs-extra": "^10.1.0",
     "react-json-view": "^1.21.3",
diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json
index f1b6d842bc54..e4247fa62587 100644
--- a/packages/docusaurus-plugin-google-analytics/package.json
+++ b/packages/docusaurus-plugin-google-analytics/package.json
@@ -19,6 +19,7 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
     "tslib": "^2.4.0"
   },
diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json
index 80456c6ffa89..f00b672e394c 100644
--- a/packages/docusaurus-plugin-google-gtag/package.json
+++ b/packages/docusaurus-plugin-google-gtag/package.json
@@ -19,6 +19,7 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
     "tslib": "^2.4.0"
   },
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index d653cec6f0e0..cf79146b19ee 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -24,6 +24,7 @@
     "@docusaurus/lqip-loader": "2.0.0-beta.21",
     "@docusaurus/responsive-loader": "^1.7.0",
     "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
     "@endiliey/react-ideal-image": "^0.0.11",
     "react-waypoint": "^10.1.0",
diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json
index 6aa7138c16d8..9048db7d4d0a 100644
--- a/packages/docusaurus-plugin-pwa/package.json
+++ b/packages/docusaurus-plugin-pwa/package.json
@@ -25,6 +25,7 @@
     "@docusaurus/core": "2.0.0-beta.21",
     "@docusaurus/theme-common": "2.0.0-beta.21",
     "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
     "babel-loader": "^8.2.5",
diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json
index e3914972950f..2b9a9430eeae 100644
--- a/packages/docusaurus-plugin-sitemap/package.json
+++ b/packages/docusaurus-plugin-sitemap/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
     "@docusaurus/logger": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-common": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
diff --git a/packages/docusaurus-preset-classic/package.json b/packages/docusaurus-preset-classic/package.json
index 9bbd73146a14..7a1cccb25234 100644
--- a/packages/docusaurus-preset-classic/package.json
+++ b/packages/docusaurus-preset-classic/package.json
@@ -28,7 +28,8 @@
     "@docusaurus/plugin-sitemap": "2.0.0-beta.21",
     "@docusaurus/theme-classic": "2.0.0-beta.21",
     "@docusaurus/theme-common": "2.0.0-beta.21",
-    "@docusaurus/theme-search-algolia": "2.0.0-beta.21"
+    "@docusaurus/theme-search-algolia": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21"
   },
   "peerDependencies": {
     "react": "^16.8.4 || ^17.0.0",
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index 6eba97104c4b..265f41be2a66 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -21,11 +21,14 @@
   },
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/mdx-loader": "2.0.0-beta.21",
+    "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "@docusaurus/plugin-content-blog": "2.0.0-beta.21",
     "@docusaurus/plugin-content-docs": "2.0.0-beta.21",
     "@docusaurus/plugin-content-pages": "2.0.0-beta.21",
     "@docusaurus/theme-common": "2.0.0-beta.21",
     "@docusaurus/theme-translations": "2.0.0-beta.21",
+    "@docusaurus/types": "2.0.0-beta.21",
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-common": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
@@ -40,7 +43,8 @@
     "prismjs": "^1.28.0",
     "react-router-dom": "^5.3.3",
     "rtlcss": "^3.5.0",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.0",
+    "utility-types": "^3.10.0"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.0.0-beta.21",
diff --git a/packages/docusaurus-theme-common/package.json b/packages/docusaurus-theme-common/package.json
index 8aac5aa0d043..6769b7f0e6f5 100644
--- a/packages/docusaurus-theme-common/package.json
+++ b/packages/docusaurus-theme-common/package.json
@@ -28,10 +28,15 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@docusaurus/mdx-loader": "2.0.0-beta.21",
     "@docusaurus/module-type-aliases": "2.0.0-beta.21",
     "@docusaurus/plugin-content-blog": "2.0.0-beta.21",
     "@docusaurus/plugin-content-docs": "2.0.0-beta.21",
     "@docusaurus/plugin-content-pages": "2.0.0-beta.21",
+    "@docusaurus/utils": "2.0.0-beta.21",
+    "@types/history": "^4.7.11",
+    "@types/react": "*",
+    "@types/react-router-config": "*",
     "clsx": "^1.1.1",
     "parse-numeric-range": "^1.3.0",
     "prism-react-renderer": "^1.3.3",
diff --git a/packages/docusaurus-types/package.json b/packages/docusaurus-types/package.json
index 56e45bc4afd6..4415cf4a1c37 100644
--- a/packages/docusaurus-types/package.json
+++ b/packages/docusaurus-types/package.json
@@ -13,8 +13,8 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@types/history": "^4.7.11",
     "commander": "^5.1.0",
-    "history": "^4.9.0",
     "joi": "^17.6.0",
     "react-helmet-async": "^1.3.0",
     "utility-types": "^3.10.0",
diff --git a/packages/docusaurus-utils-common/package.json b/packages/docusaurus-utils-common/package.json
index 52a8a7fdf3d4..50ea22d1d835 100644
--- a/packages/docusaurus-utils-common/package.json
+++ b/packages/docusaurus-utils-common/package.json
@@ -21,8 +21,13 @@
   "dependencies": {
     "tslib": "^2.4.0"
   },
-  "devDependencies": {
-    "@docusaurus/types": "2.0.0-beta.21"
+  "peerDependencies": {
+    "@docusaurus/types": "*"
+  },
+  "peerDependenciesMeta": {
+    "@docusaurus/types": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">=16.14"
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index 4e02766a5e45..f4c1f954d68a 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -44,5 +44,13 @@
     "@types/micromatch": "^4.0.2",
     "@types/react-dom": "^18.0.5",
     "dedent": "^0.7.0"
+  },
+  "peerDependencies": {
+    "@docusaurus/types": "*"
+  },
+  "peerDependenciesMeta": {
+    "@docusaurus/types": {
+      "optional": true
+    }
   }
 }

From f443e992b9d083a4a45c93a5f9a8adacbb45ae47 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Sun, 29 May 2022 22:36:41 +0800
Subject: [PATCH 33/43] refactor: mark toc in loaded MDX as non-optional
 (#7524)

---
 packages/docusaurus-mdx-loader/src/index.ts         |  2 +-
 .../remark/toc/__tests__/__fixtures__/no-heading.md |  7 +++++++
 .../toc/__tests__/__snapshots__/index.test.ts.snap  | 13 +++++++++++++
 .../src/remark/toc/__tests__/index.test.ts          |  5 +++++
 .../docusaurus-mdx-loader/src/remark/toc/index.ts   |  8 +++-----
 .../docusaurus-theme-classic/src/theme-classic.d.ts |  2 --
 .../src/theme/BlogPostPage/index.tsx                |  4 +---
 .../src/theme/DocCardList/index.tsx                 |  2 +-
 .../src/theme/DocItem/index.tsx                     |  3 +--
 .../src/theme/MDXPage/index.tsx                     |  2 +-
 .../plugins/changelog/theme/ChangelogPage/index.tsx |  4 +---
 11 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading.md

diff --git a/packages/docusaurus-mdx-loader/src/index.ts b/packages/docusaurus-mdx-loader/src/index.ts
index 1b7f2be72344..ad7887dcc77c 100644
--- a/packages/docusaurus-mdx-loader/src/index.ts
+++ b/packages/docusaurus-mdx-loader/src/index.ts
@@ -21,7 +21,7 @@ export type LoadedMDXContent<FrontMatter, Metadata, Assets = undefined> = {
   /** As provided by the content plugin. */
   readonly metadata: Metadata;
   /** A list of TOC items (headings). */
-  readonly toc?: readonly TOCItem[];
+  readonly toc: readonly TOCItem[];
   /** First h1 title before any content. */
   readonly contentTitle: string | undefined;
   /**
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading.md b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading.md
new file mode 100644
index 000000000000..d02f9a00f460
--- /dev/null
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading.md
@@ -0,0 +1,7 @@
+foo
+
+`bar`
+
+```js
+baz
+```
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap
index b87c1cd50d75..e7811b9e9f26 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap
@@ -119,6 +119,19 @@ Content.
 "
 `;
 
+exports[`toc remark plugin outputs empty array for no TOC 1`] = `
+"export const toc = [];
+
+foo
+
+\`bar\`
+
+\`\`\`js
+baz
+\`\`\`
+"
+`;
+
 exports[`toc remark plugin works on non text phrasing content 1`] = `
 "export const toc = [
 	{
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts
index 43b627c8b1dc..acd2a37615e2 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts
@@ -25,6 +25,11 @@ const processFixture = async (name: string) => {
 };
 
 describe('toc remark plugin', () => {
+  it('outputs empty array for no TOC', async () => {
+    const result = await processFixture('no-heading');
+    expect(result).toMatchSnapshot();
+  });
+
   it('works on non text phrasing content', async () => {
     const result = await processFixture('non-text-content');
     expect(result).toMatchSnapshot();
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
index 5e6c694dc339..9fe619e32532 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
@@ -89,10 +89,8 @@ export default function plugin(): Transformer {
     const {children} = root as Parent<Literal>;
     const targetIndex = getOrCreateExistingTargetIndex(children);
 
-    if (headings.length) {
-      children[targetIndex]!.value = `export const ${name} = ${stringifyObject(
-        headings,
-      )};`;
-    }
+    children[targetIndex]!.value = `export const ${name} = ${stringifyObject(
+      headings,
+    )};`;
   };
 }
diff --git a/packages/docusaurus-theme-classic/src/theme-classic.d.ts b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
index 1986158d8e22..f182ba6470ac 100644
--- a/packages/docusaurus-theme-classic/src/theme-classic.d.ts
+++ b/packages/docusaurus-theme-classic/src/theme-classic.d.ts
@@ -328,8 +328,6 @@ declare module '@theme/DocSidebar' {
     readonly sidebar: readonly PropSidebarItem[];
     readonly onCollapse: () => void;
     readonly isHidden: boolean;
-    // MobileSecondaryFilter expects Record<string, unknown>
-    readonly [key: string]: unknown;
   }
 
   export default function DocSidebar(props: Props): JSX.Element;
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
index 3d47fc4dd379..d09c589f305c 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
@@ -65,9 +65,7 @@ function BlogPostPageContent(props: Props): JSX.Element {
     <BlogLayout
       sidebar={sidebar}
       toc={
-        !hideTableOfContents &&
-        BlogPostContents.toc &&
-        BlogPostContents.toc.length > 0 ? (
+        !hideTableOfContents && BlogPostContents.toc.length > 0 ? (
           <TOC
             toc={BlogPostContents.toc}
             minHeadingLevel={tocMinHeadingLevel}
diff --git a/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx
index 3c105378ae81..b2d480697ac3 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx
@@ -27,7 +27,7 @@ export default function DocCardList({items, className}: Props): JSX.Element {
     <section className={clsx('row', className)}>
       {filterItems(items).map((item, index) => (
         <article key={index} className="col col--6 margin-bottom--lg">
-          <DocCard key={index} item={item} />
+          <DocCard item={item} />
         </article>
       ))}
     </section>
diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx
index fa75f1c162e5..5e1e9debcf44 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx
@@ -55,8 +55,7 @@ function DocItemContent(props: Props): JSX.Element {
 
   const windowSize = useWindowSize();
 
-  const canRenderTOC =
-    !hideTableOfContents && DocContent.toc && DocContent.toc.length > 0;
+  const canRenderTOC = !hideTableOfContents && DocContent.toc.length > 0;
 
   const renderTocDesktop =
     canRenderTOC && (windowSize === 'desktop' || windowSize === 'ssr');
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx
index 64bb180a5634..e0fbca8fcf8d 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx
@@ -42,7 +42,7 @@ export default function MDXPage(props: Props): JSX.Element {
                 <MDXPageContent />
               </MDXContent>
             </div>
-            {!hideTableOfContents && MDXPageContent.toc && (
+            {!hideTableOfContents && MDXPageContent.toc.length > 0 && (
               <div className="col col--2">
                 <TOC
                   toc={MDXPageContent.toc}
diff --git a/website/src/plugins/changelog/theme/ChangelogPage/index.tsx b/website/src/plugins/changelog/theme/ChangelogPage/index.tsx
index 7ce92e1707d2..5f4a128d7759 100644
--- a/website/src/plugins/changelog/theme/ChangelogPage/index.tsx
+++ b/website/src/plugins/changelog/theme/ChangelogPage/index.tsx
@@ -77,9 +77,7 @@ function ChangelogPageContent(props: Props): JSX.Element {
       <BlogLayout
         sidebar={sidebar}
         toc={
-          !hideTableOfContents &&
-          BlogPostContents.toc &&
-          BlogPostContents.toc.length > 0 ? (
+          !hideTableOfContents && BlogPostContents.toc.length > 0 ? (
             <TOC
               toc={BlogPostContents.toc}
               minHeadingLevel={tocMinHeadingLevel}

From 9023b7740c820b2d61d2870d61182e8432f9ae10 Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Mon, 30 May 2022 14:49:51 +0800
Subject: [PATCH 34/43] refactor: remove sub-eslintrc, fix more lint errors
 (#7530)

---
 .eslintrc.js                                  | 52 ++++++++++++++-----
 packages/create-docusaurus/bin/index.js       | 10 ++--
 packages/docusaurus-logger/src/index.ts       | 10 ++--
 .../no-heading-with-toc-export.md             |  9 ++++
 .../__snapshots__/index.test.ts.snap          | 13 +++++
 .../src/remark/toc/__tests__/index.test.ts    |  8 +++
 .../src/remark/toc/index.ts                   |  8 +--
 packages/docusaurus-migrate/src/index.ts      | 26 ++++++----
 .../src/index.ts                              |  6 +--
 .../src/renderReloadPopup.tsx                 |  2 +-
 .../src/__tests__/createSitemap.test.ts       |  6 +++
 .../src/theme/MDXComponents/Code.tsx          |  7 ++-
 .../src/theme/MDXComponents/Details.tsx       |  3 +-
 .../src/theme/MDXComponents/Head.tsx          |  8 ++-
 .../src/theme/MDXComponents/Pre.tsx           |  3 +-
 .../src/utils/historyUtils.ts                 |  6 +--
 packages/docusaurus/src/client/.eslintrc.js   | 27 ----------
 .../src/client/exports/ErrorBoundary.tsx      |  1 +
 .../__tests__/translations.test.ts            |  4 +-
 packages/eslint-plugin/.eslintrc.js           | 10 ----
 20 files changed, 128 insertions(+), 91 deletions(-)
 create mode 100644 packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading-with-toc-export.md
 delete mode 100644 packages/docusaurus/src/client/.eslintrc.js
 delete mode 100644 packages/eslint-plugin/.eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.js
index 051366201728..c24b8215bd2d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,7 +19,8 @@ module.exports = {
   },
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    allowImportExportEverywhere: true,
+    // tsconfigRootDir: __dirname,
+    // project: ['./tsconfig.json', './website/tsconfig.json'],
   },
   globals: {
     JSX: true,
@@ -30,6 +31,8 @@ module.exports = {
     'plugin:jest/recommended',
     'airbnb',
     'plugin:@typescript-eslint/recommended',
+    // 'plugin:@typescript-eslint/recommended-requiring-type-checking',
+    // 'plugin:@typescript-eslint/strict',
     'plugin:regexp/recommended',
     'prettier',
     'plugin:@docusaurus/all',
@@ -302,6 +305,9 @@ module.exports = {
     'react/prop-types': OFF,
     'react/require-default-props': [ERROR, {ignoreFunctionalComponents: true}],
 
+    '@typescript-eslint/consistent-type-definitions': OFF,
+    '@typescript-eslint/require-await': OFF,
+
     '@typescript-eslint/ban-ts-comment': [
       ERROR,
       {'ts-expect-error': 'allow-with-description'},
@@ -363,20 +369,39 @@ module.exports = {
   overrides: [
     {
       files: [
-        'packages/docusaurus-*/src/theme/**/*.js',
-        'packages/docusaurus-*/src/theme/**/*.ts',
-        'packages/docusaurus-*/src/theme/**/*.tsx',
+        'packages/docusaurus-*/src/theme/**/*.{js,ts,tsx}',
+        'packages/docusaurus/src/client/**/*.{js,ts,tsx}',
       ],
       rules: {
-        'import/no-named-export': ERROR,
+        'no-restricted-imports': [
+          'error',
+          {
+            patterns: [
+              // Prevent importing lodash in client bundle for bundle size
+              'lodash',
+              'lodash.**',
+              'lodash/**',
+              // Prevent importing server code in client bundle
+              '**/../babel/**',
+              '**/../server/**',
+              '**/../commands/**',
+              '**/../webpack/**',
+            ],
+          },
+        ],
       },
     },
     {
       files: [
-        'packages/create-docusaurus/templates/**/*.js',
-        'packages/create-docusaurus/templates/**/*.ts',
-        'packages/create-docusaurus/templates/**/*.tsx',
+        'packages/docusaurus-*/src/theme/**/*.{js,ts,tsx}',
+        'packages/docusaurus/src/client/theme-fallback/**/*.{js,ts,tsx}',
       ],
+      rules: {
+        'import/no-named-export': ERROR,
+      },
+    },
+    {
+      files: ['packages/create-docusaurus/templates/**/*.{js,ts,tsx}'],
       rules: {
         'header/header': OFF,
         'global-require': OFF,
@@ -391,14 +416,14 @@ module.exports = {
       },
     },
     {
-      files: ['*.ts', '*.tsx'],
+      files: ['*.{ts,tsx}'],
       rules: {
         'no-undef': OFF,
         'import/no-import-module-exports': OFF,
       },
     },
     {
-      files: ['*.js', '*.mjs', '.cjs'],
+      files: ['*.{js,mjs,cjs}'],
       rules: {
         // Make JS code directly runnable in Node.
         '@typescript-eslint/no-var-requires': OFF,
@@ -419,8 +444,7 @@ module.exports = {
       // Internal files where extraneous deps don't matter much at long as
       // they run
       files: [
-        '*.test.ts',
-        '*.test.tsx',
+        '*.test.{js,ts,tsx}',
         'admin/**',
         'jest/**',
         'website/**',
@@ -431,5 +455,9 @@ module.exports = {
         'import/no-extraneous-dependencies': OFF,
       },
     },
+    {
+      files: ['packages/eslint-plugin/**/*.{js,ts}'],
+      extends: ['plugin:eslint-plugin/recommended'],
+    },
   ],
 };
diff --git a/packages/create-docusaurus/bin/index.js b/packages/create-docusaurus/bin/index.js
index 35e135ebc65c..be5e14f68965 100755
--- a/packages/create-docusaurus/bin/index.js
+++ b/packages/create-docusaurus/bin/index.js
@@ -47,12 +47,12 @@ program
 \`custom\`: enter your custom git clone command. We will prompt you for it.`,
   )
   .description('Initialize website.')
-  .action((siteName, template, rootDir, options) => {
+  .action((siteName, template, rootDir, options) =>
     // See https://github.com/facebook/docusaurus/pull/6860
-    import('../lib/index.js').then(({default: init}) => {
-      init(path.resolve(rootDir ?? '.'), siteName, template, options);
-    });
-  });
+    import('../lib/index.js').then(({default: init}) =>
+      init(path.resolve(rootDir ?? '.'), siteName, template, options),
+    ),
+  );
 
 program.parse(process.argv);
 
diff --git a/packages/docusaurus-logger/src/index.ts b/packages/docusaurus-logger/src/index.ts
index 768cb8f9a0c2..f430555b0e26 100644
--- a/packages/docusaurus-logger/src/index.ts
+++ b/packages/docusaurus-logger/src/index.ts
@@ -128,11 +128,11 @@ function newLine(): void {
 }
 
 const logger = {
-  red: chalk.red,
-  yellow: chalk.yellow,
-  green: chalk.green,
-  bold: chalk.bold,
-  dim: chalk.dim,
+  red: (msg: string | number): string => chalk.red(msg),
+  yellow: (msg: string | number): string => chalk.yellow(msg),
+  green: (msg: string | number): string => chalk.green(msg),
+  bold: (msg: string | number): string => chalk.bold(msg),
+  dim: (msg: string | number): string => chalk.dim(msg),
   path,
   url,
   name,
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading-with-toc-export.md b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading-with-toc-export.md
new file mode 100644
index 000000000000..900b8900c1f9
--- /dev/null
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__fixtures__/no-heading-with-toc-export.md
@@ -0,0 +1,9 @@
+foo
+
+`bar`
+
+```js
+baz
+```
+
+export const toc = 1;
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap
index e7811b9e9f26..ba71805a2ab5 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/__snapshots__/index.test.ts.snap
@@ -1,5 +1,18 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`toc remark plugin does not overwrite TOC var if no TOC 1`] = `
+"foo
+
+\`bar\`
+
+\`\`\`js
+baz
+\`\`\`
+
+export const toc = 1;
+"
+`;
+
 exports[`toc remark plugin escapes inline code 1`] = `
 "export const toc = [
 	{
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts
index acd2a37615e2..6df3e94e672b 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/__tests__/index.test.ts
@@ -30,6 +30,14 @@ describe('toc remark plugin', () => {
     expect(result).toMatchSnapshot();
   });
 
+  // A very implicit API: we allow users to hand-write the toc variable. It will
+  // get overwritten in most cases, but until we find a better way, better keep
+  // supporting this
+  it('does not overwrite TOC var if no TOC', async () => {
+    const result = await processFixture('no-heading-with-toc-export');
+    expect(result).toMatchSnapshot();
+  });
+
   it('works on non text phrasing content', async () => {
     const result = await processFixture('non-text-content');
     expect(result).toMatchSnapshot();
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
index 9fe619e32532..5e6c694dc339 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
@@ -89,8 +89,10 @@ export default function plugin(): Transformer {
     const {children} = root as Parent<Literal>;
     const targetIndex = getOrCreateExistingTargetIndex(children);
 
-    children[targetIndex]!.value = `export const ${name} = ${stringifyObject(
-      headings,
-    )};`;
+    if (headings.length) {
+      children[targetIndex]!.value = `export const ${name} = ${stringifyObject(
+        headings,
+      )};`;
+    }
   };
 }
diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts
index f5bf38134bc0..bab7fd688222 100644
--- a/packages/docusaurus-migrate/src/index.ts
+++ b/packages/docusaurus-migrate/src/index.ts
@@ -8,7 +8,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 import logger from '@docusaurus/logger';
-import {Globby} from '@docusaurus/utils';
+import {Globby, DOCUSAURUS_VERSION} from '@docusaurus/utils';
 import importFresh from 'import-fresh';
 import Color from 'color';
 
@@ -23,9 +23,6 @@ import type {
   VersionTwoConfig,
 } from './types';
 
-const DOCUSAURUS_VERSION = (importFresh('../package.json') as {version: string})
-  .version;
-
 async function walk(dir: string): Promise<string[]> {
   const results: string[] = [];
   const list = await fs.readdir(dir);
@@ -82,7 +79,8 @@ export async function migrateDocusaurusProject(
   shouldMigratePages: boolean = false,
 ): Promise<void> {
   async function createMigrationContext(): Promise<MigrationContext> {
-    const v1Config = importFresh(`${siteDir}/siteConfig`) as VersionOneConfig;
+    const v1Config = (await import(`${siteDir}/siteConfig`))
+      .default as VersionOneConfig;
     logger.info('Starting migration from v1 to v2...');
     const deps = {
       '@docusaurus/core': DOCUSAURUS_VERSION,
@@ -444,9 +442,9 @@ async function migrateBlogFiles(context: MigrationContext) {
 async function handleVersioning(context: MigrationContext) {
   const {siteDir, newDir} = context;
   if (await fs.pathExists(path.join(siteDir, 'versions.json'))) {
-    const loadedVersions: string[] = await fs.readJSON(
+    const loadedVersions = (await fs.readJSON(
       path.join(siteDir, 'versions.json'),
-    );
+    )) as string[];
     await fs.copyFile(
       path.join(siteDir, 'versions.json'),
       path.join(newDir, 'versions.json'),
@@ -488,7 +486,11 @@ async function migrateVersionedDocs(
           path.join(newDir, 'versioned_docs', `version-${version}`),
         );
         await fs.copy(
-          path.join(newDir, 'versioned_docs', `version-${versions[index - 1]}`),
+          path.join(
+            newDir,
+            'versioned_docs',
+            `version-${versions[index - 1]!}`,
+          ),
           path.join(newDir, 'versioned_docs', `version-${version}`),
         );
         await fs.copy(
@@ -497,7 +499,11 @@ async function migrateVersionedDocs(
         );
       } catch {
         await fs.copy(
-          path.join(newDir, 'versioned_docs', `version-${versions[index - 1]}`),
+          path.join(
+            newDir,
+            'versioned_docs',
+            `version-${versions[index - 1]!}`,
+          ),
           path.join(newDir, 'versioned_docs', `version-${version}`),
         );
       }
@@ -543,7 +549,7 @@ async function migrateVersionedSidebar(
         `version-${version}-sidebars.json`,
       );
       try {
-        sidebarEntries = await fs.readJSON(sidebarPath);
+        sidebarEntries = (await fs.readJSON(sidebarPath)) as SidebarEntries;
       } catch {
         sidebars.push({version, entries: sidebars[i - 1]!.entries});
         return;
diff --git a/packages/docusaurus-plugin-content-docs/src/index.ts b/packages/docusaurus-plugin-content-docs/src/index.ts
index afbb809fb718..a8557542430f 100644
--- a/packages/docusaurus-plugin-content-docs/src/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/index.ts
@@ -100,9 +100,9 @@ export default async function pluginContentDocs(
         .command(command)
         .arguments('<version>')
         .description(commandDescription)
-        .action((version: unknown) => {
-          cliDocsVersionCommand(version, options, context);
-        });
+        .action((version: unknown) =>
+          cliDocsVersionCommand(version, options, context),
+        );
     },
 
     getTranslationFiles({content}) {
diff --git a/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx b/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx
index fe8e9eb2b0cd..2958a7dee833 100644
--- a/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx
+++ b/packages/docusaurus-plugin-pwa/src/renderReloadPopup.tsx
@@ -21,7 +21,7 @@ const createContainer = () => {
 };
 
 export default async function renderReloadPopup(props: Props): Promise<void> {
-  const container = getContainer() || createContainer();
+  const container = getContainer() ?? createContainer();
   const ReloadPopup = (await import('@theme/PwaReloadPopup')).default;
   ReactDOM.render(<ReloadPopup {...props} />, container);
 }
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
index bc34ee51d87f..b033a0cc7243 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
@@ -23,6 +23,7 @@ describe('createSitemap', () => {
         changefreq: EnumChangefreq.DAILY,
         priority: 0.7,
         ignorePatterns: [],
+        filename: 'sitemap.xml',
       },
     );
     expect(sitemap).toContain(
@@ -49,6 +50,7 @@ describe('createSitemap', () => {
         changefreq: EnumChangefreq.DAILY,
         priority: 0.7,
         ignorePatterns: [],
+        filename: 'sitemap.xml',
       },
     );
     expect(sitemap).not.toContain('404');
@@ -70,6 +72,7 @@ describe('createSitemap', () => {
           // Deep ignore
           '/tags/**',
         ],
+        filename: 'sitemap.xml',
       },
     );
     expect(sitemap).not.toContain('/search/</loc>');
@@ -89,6 +92,7 @@ describe('createSitemap', () => {
         changefreq: EnumChangefreq.DAILY,
         priority: 0.7,
         ignorePatterns: [],
+        filename: 'sitemap.xml',
       },
     );
 
@@ -110,6 +114,7 @@ describe('createSitemap', () => {
         changefreq: EnumChangefreq.DAILY,
         priority: 0.7,
         ignorePatterns: [],
+        filename: 'sitemap.xml',
       },
     );
 
@@ -131,6 +136,7 @@ describe('createSitemap', () => {
         changefreq: EnumChangefreq.DAILY,
         priority: 0.7,
         ignorePatterns: [],
+        filename: 'sitemap.xml',
       },
     );
 
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Code.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Code.tsx
index 4d5680ed0adb..c1977000be7c 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Code.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Code.tsx
@@ -11,7 +11,7 @@ import CodeBlock from '@theme/CodeBlock';
 import type {Props} from '@theme/MDXComponents/Code';
 
 export default function MDXCode(props: Props): JSX.Element {
-  const inlineElements = [
+  const inlineElements: (string | undefined)[] = [
     'a',
     'b',
     'big',
@@ -26,7 +26,10 @@ export default function MDXCode(props: Props): JSX.Element {
   const shouldBeInline = React.Children.toArray(props.children).every(
     (el) =>
       (typeof el === 'string' && !el.includes('\n')) ||
-      (isValidElement(el) && inlineElements.includes(el.props.mdxType)),
+      (isValidElement(el) &&
+        inlineElements.includes(
+          (el.props as {mdxType: string} | null)?.mdxType,
+        )),
   );
 
   return shouldBeInline ? (
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx
index c99fdc2a6adb..08ddaf1a1fee 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Details.tsx
@@ -15,7 +15,8 @@ export default function MDXDetails(props: Props): JSX.Element {
   // Details theme component
   const summary = items.find(
     (item): item is ReactElement<ComponentProps<'summary'>> =>
-      React.isValidElement(item) && item.props?.mdxType === 'summary',
+      React.isValidElement(item) &&
+      (item.props as {mdxType: string} | null)?.mdxType === 'summary',
   );
   const children = <>{items.filter((item) => item !== summary)}</>;
 
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx
index bf8867f409ba..3b8924c0ed6d 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Head.tsx
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React, {type ReactElement, type ComponentProps} from 'react';
-import Head from '@docusaurus/Head';
+import React, {type ReactElement} from 'react';
+import Head, {type Props as HeadProps} from '@docusaurus/Head';
 import type {Props} from '@theme/MDXComponents/Head';
 
 // MDX elements are wrapped through the MDX pragma. In some cases (notably usage
@@ -25,7 +25,5 @@ export default function MDXHead(props: Props): JSX.Element {
   const unwrappedChildren = React.Children.map(props.children, (child) =>
     React.isValidElement(child) ? unwrapMDXElement(child) : child,
   );
-  return (
-    <Head {...(props as ComponentProps<typeof Head>)}>{unwrappedChildren}</Head>
-  );
+  return <Head {...(props as HeadProps)}>{unwrappedChildren}</Head>;
 }
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx
index 75e64c997171..cde1899da83e 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Pre.tsx
@@ -14,7 +14,8 @@ export default function MDXPre(props: Props): JSX.Element {
     <CodeBlock
       // If this pre is created by a ``` fenced codeblock, unwrap the children
       {...(isValidElement(props.children) &&
-      props.children.props?.originalType === 'code'
+      (props.children.props as {originalType: string} | null)?.originalType ===
+        'code'
         ? props.children.props
         : {...props})}
     />
diff --git a/packages/docusaurus-theme-common/src/utils/historyUtils.ts b/packages/docusaurus-theme-common/src/utils/historyUtils.ts
index 129396b44e7d..921f9458868d 100644
--- a/packages/docusaurus-theme-common/src/utils/historyUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/historyUtils.ts
@@ -18,12 +18,12 @@ type HistoryBlockHandler = (location: Location, action: Action) => void | false;
  * will be blocked/cancelled.
  */
 function useHistoryActionHandler(handler: HistoryBlockHandler): void {
-  const {block} = useHistory();
+  const history = useHistory();
   const stableHandler = useDynamicCallback(handler);
   useEffect(
     // See https://github.com/remix-run/history/blob/main/docs/blocking-transitions.md
-    () => block((location, action) => stableHandler(location, action)),
-    [block, stableHandler],
+    () => history.block((location, action) => stableHandler(location, action)),
+    [history, stableHandler],
   );
 }
 
diff --git a/packages/docusaurus/src/client/.eslintrc.js b/packages/docusaurus/src/client/.eslintrc.js
deleted file mode 100644
index cbef5af73663..000000000000
--- a/packages/docusaurus/src/client/.eslintrc.js
+++ /dev/null
@@ -1,27 +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.
- */
-
-module.exports = {
-  rules: {
-    'no-restricted-imports': [
-      'error',
-      {
-        patterns: [
-          // Prevent importing lodash in client bundle for bundle size
-          'lodash',
-          'lodash.**',
-          'lodash/**',
-          // Prevent importing server code in client bundle
-          '**/../babel/**',
-          '**/../server/**',
-          '**/../commands/**',
-          '**/../webpack/**',
-        ],
-      },
-    ],
-  },
-};
diff --git a/packages/docusaurus/src/client/exports/ErrorBoundary.tsx b/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
index 0d188d4da44b..c29a33a9ca32 100644
--- a/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
+++ b/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
@@ -18,6 +18,7 @@ type State = {
   error: Error | null;
 };
 
+// eslint-disable-next-line react/function-component-definition
 const DefaultFallback: FallbackFunction = (params) => (
   <ThemeError {...params} />
 );
diff --git a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
index 70da33ffd3eb..1e1b59aad85f 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
@@ -45,9 +45,7 @@ async function createTmpTranslationFile(
 
   return {
     siteDir,
-    readFile() {
-      return fs.readJSON(filePath);
-    },
+    readFile: () => fs.readJSON(filePath),
   };
 }
 
diff --git a/packages/eslint-plugin/.eslintrc.js b/packages/eslint-plugin/.eslintrc.js
deleted file mode 100644
index 81bfbca20171..000000000000
--- a/packages/eslint-plugin/.eslintrc.js
+++ /dev/null
@@ -1,10 +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.
- */
-
-module.exports = {
-  extends: ['../../.eslintrc.js', 'plugin:eslint-plugin/recommended'],
-};

From b81f80d06a1350f320a35a4303166e10840c001d Mon Sep 17 00:00:00 2001
From: DOLLE <jeremy.dolle34@gmail.com>
Date: Wed, 1 Jun 2022 11:12:12 +0200
Subject: [PATCH 35/43] docs: update react native boilerplate preview (#7542)

* update design preview

* optimize image

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
---
 .../data/showcase/reactnativeboilerplate.png  | Bin 19693 -> 47728 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/website/src/data/showcase/reactnativeboilerplate.png b/website/src/data/showcase/reactnativeboilerplate.png
index 6513e67841e92264afa240879aa7ef254daaa6c1..ce93a1f61fd52a7d099d5d52b0a73be91a7f6a94 100644
GIT binary patch
literal 47728
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
z%0D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
M07*qoM6N<$g7wK&X8-^I

literal 19693
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


From 5cf6432e4e486ec54a88a4d8be9f65dcf02ee84b Mon Sep 17 00:00:00 2001
From: Joshua Chen <sidachen2003@gmail.com>
Date: Wed, 1 Jun 2022 19:32:25 +0800
Subject: [PATCH 36/43] docs: avoid using nested mdx-code-block (#7543)

* docs: avoid using nested mdx-code-block

* fix
---
 website/docs/blog.mdx                         | 46 +++++++++++++------
 website/docs/deployment.mdx                   | 21 ++++++---
 .../markdown-features-admonitions.mdx         | 10 +++-
 .../markdown-features-code-blocks.mdx         | 46 +++++++++++++------
 .../markdown-features-react.mdx               | 43 ++++++++---------
 website/docs/swizzling.md                     |  8 +++-
 6 files changed, 114 insertions(+), 60 deletions(-)

diff --git a/website/docs/blog.mdx b/website/docs/blog.mdx
index 26ef286377b6..b215ae66a20f 100644
--- a/website/docs/blog.mdx
+++ b/website/docs/blog.mdx
@@ -192,9 +192,10 @@ Use the `authors` front matter field to declare blog post authors. An author sho
 
 Blog post authors can be declared directly inside the front matter:
 
-````mdx-code-block
+```mdx-code-block
 <Tabs groupId="author-front-matter">
-  <TabItem value="single" label="Single author">
+<TabItem value="single" label="Single author">
+```
 
 ```md title="my-blog-post.md"
 ---
@@ -207,8 +208,10 @@ authors:
 ---
 ```
 
-  </TabItem>
-  <TabItem value="multiple" label="Multiple authors">
+```mdx-code-block
+</TabItem>
+<TabItem value="multiple" label="Multiple authors">
+```
 
 ```md title="my-blog-post.md"
 ---
@@ -225,9 +228,10 @@ authors:
 ---
 ```
 
-  </TabItem>
+```mdx-code-block
+</TabItem>
 </Tabs>
-````
+```
 
 :::tip
 
@@ -279,9 +283,10 @@ Use the `authorsMapPath` plugin option to configure the path. JSON is also suppo
 
 In blog posts front matter, you can reference the authors declared in the global configuration file:
 
-````mdx-code-block
+```mdx-code-block
 <Tabs groupId="author-front-matter">
-  <TabItem value="single" label="Single author">
+<TabItem value="single" label="Single author">
+```
 
 ```md title="my-blog-post.md"
 ---
@@ -289,8 +294,10 @@ authors: jmarcey
 ---
 ```
 
-  </TabItem>
-  <TabItem value="multiple" label="Multiple authors">
+```mdx-code-block
+</TabItem>
+<TabItem value="multiple" label="Multiple authors">
+```
 
 ```md title="my-blog-post.md"
 ---
@@ -298,9 +305,10 @@ authors: [jmarcey, slorber]
 ---
 ```
 
-  </TabItem>
+```mdx-code-block
+</TabItem>
 </Tabs>
-````
+```
 
 :::info
 
@@ -394,9 +402,10 @@ The default reading time is able to accept additional options: `wordsPerMinute`
 
 Use the callback for all your customization needs:
 
-````mdx-code-block
+```mdx-code-block
 <Tabs>
 <TabItem value="disable-per-post" label="Per-post disabling">
+```
 
 **Disable reading time on one page:**
 
@@ -410,7 +419,9 @@ module.exports = {
           showReadingTime: true,
           // highlight-start
           readingTime: ({content, frontMatter, defaultReadingTime}) =>
-            frontMatter.hide_reading_time ? undefined : defaultReadingTime({content}),
+            frontMatter.hide_reading_time
+              ? undefined
+              : defaultReadingTime({content}),
           // highlight-end
         },
       },
@@ -429,8 +440,10 @@ hide_reading_time: true
 This page will no longer display the reading time stats!
 ```
 
+```mdx-code-block
 </TabItem>
 <TabItem value="passing-options" label="Passing options">
+```
 
 **Pass options to the default reading time function:**
 
@@ -452,8 +465,10 @@ module.exports = {
 };
 ```
 
+```mdx-code-block
 </TabItem>
 <TabItem value="using-custom-algo" label="Using custom algorithms">
+```
 
 **Use a custom implementation of reading time:**
 
@@ -475,9 +490,10 @@ module.exports = {
 };
 ```
 
+```mdx-code-block
 </TabItem>
 </Tabs>
-````
+```
 
 :::
 
diff --git a/website/docs/deployment.mdx b/website/docs/deployment.mdx
index ded6aca33f88..d537b7b48d58 100644
--- a/website/docs/deployment.mdx
+++ b/website/docs/deployment.mdx
@@ -302,31 +302,37 @@ GitHub enterprise installations should work in the same manner as github.com; yo
 
 Finally, to deploy your site to GitHub Pages, run:
 
-````mdx-code-block
+```mdx-code-block
 <Tabs>
 <TabItem value="bash" label="Bash">
+```
 
 ```bash
 GIT_USER=<GITHUB_USERNAME> yarn deploy
 ```
 
+```mdx-code-block
 </TabItem>
 <TabItem value="windows" label="Windows">
+```
 
 ```batch
 cmd /C "set "GIT_USER=<GITHUB_USERNAME>" && yarn deploy"
 ```
 
+````mdx-code-block
 </TabItem>
 <TabItem value="powershell" label="PowerShell">
+```mdx-code-block
 
 ```powershell
 cmd /C 'set "GIT_USER=<GITHUB_USERNAME>" && yarn deploy'
-```
+````
 
+```mdx-code-block
 </TabItem>
 </Tabs>
-````
+```
 
 :::caution
 
@@ -352,16 +358,16 @@ Here are two approaches to deploying your docs with GitHub Actions. Based on the
 - Source repo and deployment repo are the **same** repository.
 - The deployment repo is a **remote** repository, different from the source.
 
-````mdx-code-block
+```mdx-code-block
 <Tabs>
 <TabItem value="same" label="Same">
+```
 
 While you can have both jobs defined in the same workflow file, the original `deploy` workflow will always be listed as skipped in the PR check suite status, which is not communicative of the actual status and provides no value to the review process. We therefore propose to manage them as separate workflows instead.
 
 We will use a popular third-party deployment action: [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus).
 
 <details>
-
 <summary>GitHub action files</summary>
 
 Add these two workflow files:
@@ -446,8 +452,10 @@ jobs:
 
 </details>
 
+```mdx-code-block
 </TabItem>
 <TabItem value="remote" label="Remote">
+```
 
 A cross-repo publish is more difficult to set up, because you need to push to another repo with permission checks. We will be using SSH to do the authentication.
 
@@ -517,9 +525,10 @@ jobs:
 
 </details>
 
+```mdx-code-block
 </TabItem>
 </Tabs>
-````
+```
 
 ### Triggering deployment with Travis CI {#triggering-deployment-with-travis-ci}
 
diff --git a/website/docs/guides/markdown-features/markdown-features-admonitions.mdx b/website/docs/guides/markdown-features/markdown-features-admonitions.mdx
index a864fe0d4f50..53858f86d010 100644
--- a/website/docs/guides/markdown-features/markdown-features-admonitions.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-admonitions.mdx
@@ -47,6 +47,7 @@ Some **content** with _markdown_ `syntax`. Check [this `api`](#).
 :::
 ```
 
+```mdx-code-block
 <BrowserWindow>
 
 :::note
@@ -80,6 +81,7 @@ Some **content** with _markdown_ `syntax`. Check [this `api`](#).
 :::
 
 </BrowserWindow>
+```
 
 ## Usage with Prettier {#usage-with-prettier}
 
@@ -115,6 +117,7 @@ Some **content** with _markdown_ `syntax`.
 :::
 ```
 
+```mdx-code-block
 <BrowserWindow>
 
 :::note Your Title
@@ -124,6 +127,7 @@ Some **content** with _markdown_ `syntax`.
 :::
 
 </BrowserWindow>
+```
 
 ## Admonitions with MDX {#admonitions-with-mdx}
 
@@ -145,21 +149,21 @@ import TabItem from '@theme/TabItem';
 :::
 ```
 
+```mdx-code-block
 <BrowserWindow>
 
 :::tip Use tabs in admonitions
 
-```mdx-code-block
 <Tabs>
   <TabItem value="apple" label="Apple">This is an apple 🍎</TabItem>
   <TabItem value="orange" label="Orange">This is an orange 🍊</TabItem>
   <TabItem value="banana" label="Banana">This is a banana 🍌</TabItem>
 </Tabs>
-```
 
 :::
 
 </BrowserWindow>
+```
 
 ## Usage in JSX {#usage-in-jsx}
 
@@ -190,6 +194,7 @@ The types that are accepted are the same as above: `note`, `tip`, `danger`, `inf
 </Admonition>
 ```
 
+```mdx-code-block
 <BrowserWindow>
   <Admonition type="tip" icon="💡" title="Did you know...">
     <p>
@@ -198,3 +203,4 @@ The types that are accepted are the same as above: `note`, `tip`, `danger`, `inf
     </p>
   </Admonition>
 </BrowserWindow>
+```
diff --git a/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx b/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
index 3661393dea7e..2eaaf21837c8 100644
--- a/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
@@ -161,8 +161,9 @@ function HighlightMoreText(highlight) {
 ```
 ````
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
+```
 
 ```js
 function HighlightSomeText(highlight) {
@@ -185,8 +186,9 @@ function HighlightMoreText(highlight) {
 }
 ```
 
+```mdx-code-block
 </BrowserWindow>
-````
+```
 
 Supported commenting syntax:
 
@@ -235,8 +237,9 @@ export default MyComponent;
 ```
 ````
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
+```
 
 ```jsx {1,4-6,11}
 import React from 'react';
@@ -252,8 +255,9 @@ function MyComponent(props) {
 export default MyComponent;
 ```
 
+```mdx-code-block
 </BrowserWindow>
-````
+```
 
 :::tip prefer comments
 
@@ -347,8 +351,9 @@ console.log(name.toUpperCase());
 </Tabs>
 ```
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
+```
 
 In JavaScript, trying to access properties on `null` will error.
 
@@ -359,8 +364,9 @@ console.log(name.toUpperCase());
 // Uncaught TypeError: Cannot read properties of null (reading 'toUpperCase')
 ```
 
+```mdx-code-block
 </BrowserWindow>
-````
+```
 
 If you use number ranges in metastring (the `{1,3-4}` syntax), Docusaurus will apply the **first `magicComments` entry**'s class name. This, by default, is `theme-code-block-highlighted-line`, but if you change the `magicComments` config and use a different entry as the first one, the meaning of the metastring range will change as well.
 
@@ -396,8 +402,9 @@ export default MyComponent;
 ```
 ````
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
+```
 
 ```jsx {1,4-6,11} showLineNumbers
 import React from 'react';
@@ -413,8 +420,9 @@ function MyComponent(props) {
 export default MyComponent;
 ```
 
+```mdx-code-block
 </BrowserWindow>
-````
+```
 
 ## Interactive code editor {#interactive-code-editor}
 
@@ -465,8 +473,9 @@ function Clock(props) {
 
 The code block will be rendered as an interactive editor. Changes to the code will reflect on the result panel live.
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
+```
 
 ```jsx live
 function Clock(props) {
@@ -491,8 +500,9 @@ function Clock(props) {
 }
 ```
 
+```mdx-code-block
 </BrowserWindow>
-````
+```
 
 ### Imports {#imports}
 
@@ -541,8 +551,9 @@ export default ReactLiveScope;
 
 The `ButtonExample` component is now available to use:
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
+```
 
 ```jsx live
 function MyPlayground(props) {
@@ -554,8 +565,9 @@ function MyPlayground(props) {
 }
 ```
 
+```mdx-code-block
 </BrowserWindow>
-````
+```
 
 ## Using JSX markup in code blocks {#using-jsx-markup}
 
@@ -646,10 +658,11 @@ class HelloWorld {
 
 And you will get the following:
 
-````mdx-code-block
+```mdx-code-block
 <BrowserWindow>
 <Tabs>
 <TabItem value="js" label="JavaScript">
+```
 
 ```js
 function helloWorld() {
@@ -657,16 +670,20 @@ function helloWorld() {
 }
 ```
 
+```mdx-code-block
 </TabItem>
 <TabItem value="py" label="Python">
+```
 
 ```py
 def hello_world():
   print("Hello, world!")
 ```
 
+```mdx-code-block
 </TabItem>
 <TabItem value="java" label="Java">
+```
 
 ```java
 class HelloWorld {
@@ -676,10 +693,11 @@ class HelloWorld {
 }
 ```
 
+```mdx-code-block
 </TabItem>
 </Tabs>
 </BrowserWindow>
-````
+```
 
 If you have multiple of these multi-language code tabs, and you want to sync the selection across the tab instances, refer to the [Syncing tab choices section](markdown-features-tabs.mdx#syncing-tab-choices).
 
diff --git a/website/docs/guides/markdown-features/markdown-features-react.mdx b/website/docs/guides/markdown-features/markdown-features-react.mdx
index 0a3e31ba6dd4..47f2e6046d67 100644
--- a/website/docs/guides/markdown-features/markdown-features-react.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-react.mdx
@@ -204,21 +204,22 @@ We use lower-case tag names like `highlight` to "pretend" that they are intrinsi
 
 Docusaurus v2 is using MDX v1, which has a lot of known cases where the content fails to be correctly parsed as Markdown. Use the **[MDX playground](https://mdx-git-renovate-babel-monorepo-mdx.vercel.app/playground)** to ensure that your syntax is valid MDX.
 
-````mdx-code-block
 <details>
-
 <summary>Samples of parsing failures</summary>
 
 **A paragraph starting with a JSX tag will be seen entirely as a JSX string:**
 
+```mdx-code-block
 <Tabs groupId="jsx-and-md">
 <TabItem value="Problem">
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
 <span style={{color: 'red'}}>Highlighted text</span> but afterwards _Markdown_ **doesn't work**
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -233,6 +234,7 @@ Docusaurus v2 is using MDX v1, which has a lot of known cases where the content
 Use JSX for the rest of the line, or prefix the line with some plain text:
 
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
 <span style={{color: 'red'}}>Use JSX for the paragraph</span> to stop <i>worrying about</i> <b>Markdown</b>
@@ -240,6 +242,7 @@ Use JSX for the rest of the line, or prefix the line with some plain text:
 &#8203;<span style={{color: 'red'}}>← This is a zero-width space</span> and afterwards <i>Markdown</i> <b>works</b>
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -258,11 +261,13 @@ Use JSX for the rest of the line, or prefix the line with some plain text:
 <Tabs groupId="jsx-and-md">
 <TabItem value="Problem">
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
 <span style={{color: 'red'}}>**Bold doesn't work**</span>
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -278,6 +283,7 @@ Use JSX for the rest of the line, or prefix the line with some plain text:
 Use JSX within JSX tag, or move the Markdown to the outer layer:
 
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
 <span style={{color: 'red'}}><b>Bold now works</b></span>
@@ -285,6 +291,7 @@ Use JSX within JSX tag, or move the Markdown to the outer layer:
 **<span style={{color: 'red'}}>Bold now works</span>**
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -303,13 +310,13 @@ Use JSX within JSX tag, or move the Markdown to the outer layer:
 <Tabs groupId="jsx-and-md">
 <TabItem value="Problem">
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
-<div style={{color: 'red'}}>
-**Bold still doesn't work**
-</div>
+<div style={{color: 'red'}}>**Bold still doesn't work**</div>
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -326,15 +333,13 @@ Use JSX within JSX tag, or move the Markdown to the outer layer:
 Add an empty new line:
 
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
-<div style={{color: 'red'}}>
-
-**Bold now works**
-
-</div>
+<div style={{color: 'red'}}>**Bold now works**</div>
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -353,15 +358,13 @@ Add an empty new line:
 <Tabs groupId="jsx-and-md">
 <TabItem value="Problem">
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
-<div style={{color: 'red'}}>
-
-    You may think I'm just some text...
-
-</div>
+<div style={{color: 'red'}}>You may think I'm just some text...</div>
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -380,15 +383,13 @@ Add an empty new line:
 Don't indent:
 
 <div className={styles.wrappingBlock}>
+```
 
 ```jsx
-<div style={{color: 'red'}}>
-
-Now I'm actually just text
-
-</div>
+<div style={{color: 'red'}}>Now I'm actually just text</div>
 ```
 
+```mdx-code-block
 </div>
 <div className={styles.wrappingBlock}>
 <BrowserWindow>
@@ -402,7 +403,7 @@ Now I'm actually just text
 </TabItem>
 </Tabs>
 </details>
-````
+```
 
 ## Importing code snippets {#importing-code-snippets}
 
diff --git a/website/docs/swizzling.md b/website/docs/swizzling.md
index d1cf3347a6ae..d5ef94c86327 100644
--- a/website/docs/swizzling.md
+++ b/website/docs/swizzling.md
@@ -41,9 +41,10 @@ npm run swizzle
 
 It will generate a new component your `src/theme` directory, which should look like this example:
 
-````mdx-code-block
+```mdx-code-block
 <Tabs>
 <TabItem value="Ejecting">
+```
 
 ```jsx title="src/theme/SomeComponent.js"
 import React from 'react';
@@ -60,8 +61,10 @@ export default function SomeComponent(props) {
 }
 ```
 
+```mdx-code-block
 </TabItem>
 <TabItem value="Wrapping">
+```
 
 ```jsx title="src/theme/SomeComponent.js"
 import React from 'react';
@@ -78,9 +81,10 @@ export default function SomeComponentWrapper(props) {
 }
 ```
 
+```mdx-code-block
 </TabItem>
 </Tabs>
-````
+```
 
 To get an overview of all the themes and components available to swizzle, run:
 

From 338b819abc15c5536124fa3a1f7bdf1903199cae Mon Sep 17 00:00:00 2001
From: John Reilly <johnny_reilly@hotmail.com>
Date: Wed, 1 Jun 2022 13:34:34 +0200
Subject: [PATCH 37/43] feat: add engines field to templates' package.json
 (#7520)

---
 .../templates/classic-typescript/package.json                  | 3 +++
 packages/create-docusaurus/templates/classic/package.json      | 3 +++
 packages/create-docusaurus/templates/facebook/package.json     | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/packages/create-docusaurus/templates/classic-typescript/package.json b/packages/create-docusaurus/templates/classic-typescript/package.json
index 44ae46ef4e49..6f7971bf2757 100644
--- a/packages/create-docusaurus/templates/classic-typescript/package.json
+++ b/packages/create-docusaurus/templates/classic-typescript/package.json
@@ -39,5 +39,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "engines": {
+    "node": ">=16.14"
   }
 }
diff --git a/packages/create-docusaurus/templates/classic/package.json b/packages/create-docusaurus/templates/classic/package.json
index 4eb48ab1e867..b52e956acf66 100644
--- a/packages/create-docusaurus/templates/classic/package.json
+++ b/packages/create-docusaurus/templates/classic/package.json
@@ -36,5 +36,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "engines": {
+    "node": ">=16.14"
   }
 }
diff --git a/packages/create-docusaurus/templates/facebook/package.json b/packages/create-docusaurus/templates/facebook/package.json
index 95e6962243ae..421b880a6c22 100644
--- a/packages/create-docusaurus/templates/facebook/package.json
+++ b/packages/create-docusaurus/templates/facebook/package.json
@@ -49,5 +49,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "engines": {
+    "node": ">=16.14"
   }
 }

From 0afb21836967fb2d47686f25f19c47817bc3a9b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fl=C3=A1vio=20Silva?=
 <55815265+201flaviosilva@users.noreply.github.com>
Date: Wed, 1 Jun 2022 13:56:44 +0100
Subject: [PATCH 38/43] docs: remove extraneous bracket (#7541)

---
 website/docs/using-plugins.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/using-plugins.md b/website/docs/using-plugins.md
index d845e4bbe6f2..417e14bba1e0 100644
--- a/website/docs/using-plugins.md
+++ b/website/docs/using-plugins.md
@@ -224,7 +224,7 @@ Preset paths can be relative to the config file:
 module.exports = {
   // ...
   // highlight-next-line
-  presets: ['./src/presets/docusaurus-local-preset')],
+  presets: ['./src/presets/docusaurus-local-preset'],
 };
 ```
 

From a469ae3d63589708cafa4ec77f2ce9bf3797a25d Mon Sep 17 00:00:00 2001
From: Charles Ancheta <55412395+cbebe@users.noreply.github.com>
Date: Wed, 1 Jun 2022 07:20:23 -0600
Subject: [PATCH 39/43] docs: add CharlesAncheta.com to showcase (#7533)

* docs: add CharlesAncheta.com to showcase

* optimize image

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

diff --git a/website/src/data/showcase/charles-ancheta.png b/website/src/data/showcase/charles-ancheta.png
new file mode 100644
index 0000000000000000000000000000000000000000..9be464e35e6c8332618db3984bec56e22a0aa018
GIT binary patch
literal 13816
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
H8wUR$pp@fP

literal 0
HcmV?d00001

diff --git a/website/src/data/users.tsx b/website/src/data/users.tsx
index 01d5fcb82643..e45e09cf39a2 100644
--- a/website/src/data/users.tsx
+++ b/website/src/data/users.tsx
@@ -355,6 +355,14 @@ const Users: User[] = [
     source: 'https://github.com/chaos-mesh/website',
     tags: ['opensource', 'product', 'i18n'],
   },
+  {
+    title: 'Charles Ancheta',
+    description: "Charles Ancheta's Blog and Portfolio Website",
+    preview: require('./showcase/charles-ancheta.png'),
+    website: 'https://charlesancheta.com',
+    source: 'https://github.com/cbebe/my-website',
+    tags: ['opensource', 'personal'],
+  },
   {
     title: 'ChatKitty',
     description: 'A full suite of developer tools for any chat use-case.',

From 4f26a1911ab140f2a74ffba0122f427c3526261f Mon Sep 17 00:00:00 2001
From: dpang314 <davidpang314@gmail.com>
Date: Wed, 1 Jun 2022 10:27:58 -0400
Subject: [PATCH 40/43] feat(content-docs): last_update front matter (#7461)

Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
Co-authored-by: sebastienlorber <lorber.sebastien@gmail.com>
---
 .../simple-site/docs/customLastUpdate.md      |   8 +
 .../simple-site/docs/lastUpdateAuthorOnly.md  |   7 +
 .../simple-site/docs/lastUpdateDateOnly.md    |   7 +
 .../__tests__/__snapshots__/docs.test.ts.snap |  55 +++++-
 .../__snapshots__/index.test.ts.snap          | 130 +++++++++++++
 .../src/__tests__/docs.test.ts                | 184 ++++++++++++++++--
 .../src/__tests__/frontMatter.test.ts         |  49 +++++
 .../src/docs.ts                               |  56 ++++--
 .../src/frontMatter.ts                        |  12 ++
 .../src/plugin-content-docs.d.ts              |  10 +
 .../src/types.ts                              |   2 -
 .../_docs tests/doc-with-last-update.md       |   7 +
 website/_dogfooding/docs-tests-sidebars.js    |   1 +
 website/_dogfooding/dogfooding.config.js      |   1 +
 .../docs/api/plugins/plugin-content-docs.md   |   8 +
 15 files changed, 500 insertions(+), 37 deletions(-)
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/customLastUpdate.md
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateAuthorOnly.md
 create mode 100644 packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateDateOnly.md
 create mode 100644 website/_dogfooding/_docs tests/doc-with-last-update.md

diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/customLastUpdate.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/customLastUpdate.md
new file mode 100644
index 000000000000..b8e37d4f8a9e
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/customLastUpdate.md
@@ -0,0 +1,8 @@
+---
+title: Custom Last Update
+last_update:
+  author: Custom Author
+  date: 1/1/2000
+---
+
+Custom last update
\ No newline at end of file
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateAuthorOnly.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateAuthorOnly.md
new file mode 100644
index 000000000000..4929ed91a9c5
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateAuthorOnly.md
@@ -0,0 +1,7 @@
+---
+title: Last Update Author Only
+last_update:
+  author: Custom Author
+---
+
+Only custom author, so it will still use the date from Git
\ No newline at end of file
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateDateOnly.md b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateDateOnly.md
new file mode 100644
index 000000000000..f9bfeb9759d9
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__fixtures__/simple-site/docs/lastUpdateDateOnly.md
@@ -0,0 +1,7 @@
+---
+title: Last Update Date Only
+last_update:
+  date: 1/1/2000
+---
+
+Only custom date, so it will still use the author from Git
\ No newline at end of file
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/docs.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/docs.test.ts.snap
index f05c66e2aa21..69401a06a04c 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/docs.test.ts.snap
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/docs.test.ts.snap
@@ -3,13 +3,24 @@
 exports[`simple site custom pagination 1`] = `
 {
   "pagination": [
+    {
+      "id": "customLastUpdate",
+      "next": {
+        "permalink": "/docs/doc with space",
+        "title": "Hoo hoo, if this path tricks you...",
+      },
+      "prev": undefined,
+    },
     {
       "id": "doc with space",
       "next": {
         "permalink": "/docs/doc-draft",
         "title": "doc-draft",
       },
-      "prev": undefined,
+      "prev": {
+        "permalink": "/docs/customLastUpdate",
+        "title": "Custom Last Update",
+      },
     },
     {
       "id": "doc-draft",
@@ -63,14 +74,36 @@ exports[`simple site custom pagination 1`] = `
     {
       "id": "ipsum",
       "next": {
-        "permalink": "/docs/lorem",
-        "title": "lorem",
+        "permalink": "/docs/lastUpdateAuthorOnly",
+        "title": "Last Update Author Only",
       },
       "prev": {
         "permalink": "/docs/",
         "title": "Hello sidebar_label",
       },
     },
+    {
+      "id": "lastUpdateAuthorOnly",
+      "next": {
+        "permalink": "/docs/lastUpdateDateOnly",
+        "title": "Last Update Date Only",
+      },
+      "prev": {
+        "permalink": "/docs/ipsum",
+        "title": "ipsum",
+      },
+    },
+    {
+      "id": "lastUpdateDateOnly",
+      "next": {
+        "permalink": "/docs/lorem",
+        "title": "lorem",
+      },
+      "prev": {
+        "permalink": "/docs/lastUpdateAuthorOnly",
+        "title": "Last Update Author Only",
+      },
+    },
     {
       "id": "lorem",
       "next": {
@@ -78,8 +111,8 @@ exports[`simple site custom pagination 1`] = `
         "title": "rootAbsoluteSlug",
       },
       "prev": {
-        "permalink": "/docs/ipsum",
-        "title": "ipsum",
+        "permalink": "/docs/lastUpdateDateOnly",
+        "title": "Last Update Date Only",
       },
     },
     {
@@ -170,6 +203,10 @@ exports[`simple site custom pagination 1`] = `
   ],
   "sidebars": {
     "defaultSidebar": [
+      {
+        "id": "customLastUpdate",
+        "type": "doc",
+      },
       {
         "id": "doc with space",
         "type": "doc",
@@ -208,6 +245,14 @@ exports[`simple site custom pagination 1`] = `
         "id": "ipsum",
         "type": "doc",
       },
+      {
+        "id": "lastUpdateAuthorOnly",
+        "type": "doc",
+      },
+      {
+        "id": "lastUpdateDateOnly",
+        "type": "doc",
+      },
       {
         "id": "lorem",
         "type": "doc",
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap
index c8b0408c5ee1..c428a6c55e86 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/index.test.ts.snap
@@ -22,6 +22,7 @@ These sidebar document ids do not exist:
 - nonExistent
 
 Available document ids are:
+- customLastUpdate
 - doc with space
 - doc-draft
 - foo/bar
@@ -29,6 +30,8 @@ Available document ids are:
 - headingAsTitle
 - hello
 - ipsum
+- lastUpdateAuthorOnly
+- lastUpdateDateOnly
 - lorem
 - rootAbsoluteSlug
 - rootRelativeSlug
@@ -267,6 +270,11 @@ exports[`simple website content 5`] = `
       "versions": [
         {
           "docs": [
+            {
+              "id": "customLastUpdate",
+              "path": "/docs/customLastUpdate",
+              "sidebar": undefined,
+            },
             {
               "id": "doc with space",
               "path": "/docs/doc with space",
@@ -302,6 +310,16 @@ exports[`simple website content 5`] = `
               "path": "/docs/ipsum",
               "sidebar": undefined,
             },
+            {
+              "id": "lastUpdateAuthorOnly",
+              "path": "/docs/lastUpdateAuthorOnly",
+              "sidebar": undefined,
+            },
+            {
+              "id": "lastUpdateDateOnly",
+              "path": "/docs/lastUpdateDateOnly",
+              "sidebar": undefined,
+            },
             {
               "id": "lorem",
               "path": "/docs/lorem",
@@ -390,6 +408,26 @@ exports[`simple website content: data 1`] = `
       "permalink": "/docs/rootAbsoluteSlug"
     }
   }
+}",
+  "site-docs-custom-last-update-md-b8d.json": "{
+  "unversionedId": "customLastUpdate",
+  "id": "customLastUpdate",
+  "title": "Custom Last Update",
+  "description": "Custom last update",
+  "source": "@site/docs/customLastUpdate.md",
+  "sourceDirName": ".",
+  "slug": "/customLastUpdate",
+  "permalink": "/docs/customLastUpdate",
+  "draft": false,
+  "tags": [],
+  "version": "current",
+  "frontMatter": {
+    "title": "Custom Last Update",
+    "last_update": {
+      "author": "Custom Author",
+      "date": "1/1/2000"
+    }
+  }
 }",
   "site-docs-doc-draft-md-584.json": "{
   "unversionedId": "doc-draft",
@@ -563,6 +601,44 @@ exports[`simple website content: data 1`] = `
   "frontMatter": {
     "custom_edit_url": null
   }
+}",
+  "site-docs-last-update-author-only-md-352.json": "{
+  "unversionedId": "lastUpdateAuthorOnly",
+  "id": "lastUpdateAuthorOnly",
+  "title": "Last Update Author Only",
+  "description": "Only custom author, so it will still use the date from Git",
+  "source": "@site/docs/lastUpdateAuthorOnly.md",
+  "sourceDirName": ".",
+  "slug": "/lastUpdateAuthorOnly",
+  "permalink": "/docs/lastUpdateAuthorOnly",
+  "draft": false,
+  "tags": [],
+  "version": "current",
+  "frontMatter": {
+    "title": "Last Update Author Only",
+    "last_update": {
+      "author": "Custom Author"
+    }
+  }
+}",
+  "site-docs-last-update-date-only-md-987.json": "{
+  "unversionedId": "lastUpdateDateOnly",
+  "id": "lastUpdateDateOnly",
+  "title": "Last Update Date Only",
+  "description": "Only custom date, so it will still use the author from Git",
+  "source": "@site/docs/lastUpdateDateOnly.md",
+  "sourceDirName": ".",
+  "slug": "/lastUpdateDateOnly",
+  "permalink": "/docs/lastUpdateDateOnly",
+  "draft": false,
+  "tags": [],
+  "version": "current",
+  "frontMatter": {
+    "title": "Last Update Date Only",
+    "last_update": {
+      "date": "1/1/2000"
+    }
+  }
 }",
   "site-docs-lorem-md-b27.json": "{
   "unversionedId": "lorem",
@@ -924,6 +1000,11 @@ exports[`simple website content: data 1`] = `
     ]
   },
   "docs": {
+    "customLastUpdate": {
+      "id": "customLastUpdate",
+      "title": "Custom Last Update",
+      "description": "Custom last update"
+    },
     "doc with space": {
       "id": "doc with space",
       "title": "Hoo hoo, if this path tricks you...",
@@ -963,6 +1044,16 @@ exports[`simple website content: data 1`] = `
       "title": "ipsum",
       "description": "Lorem ipsum."
     },
+    "lastUpdateAuthorOnly": {
+      "id": "lastUpdateAuthorOnly",
+      "title": "Last Update Author Only",
+      "description": "Only custom author, so it will still use the date from Git"
+    },
+    "lastUpdateDateOnly": {
+      "id": "lastUpdateDateOnly",
+      "title": "Last Update Date Only",
+      "description": "Only custom date, so it will still use the author from Git"
+    },
     "lorem": {
       "id": "lorem",
       "title": "lorem",
@@ -1026,6 +1117,11 @@ exports[`simple website content: global data 1`] = `
       "versions": [
         {
           "docs": [
+            {
+              "id": "customLastUpdate",
+              "path": "/docs/customLastUpdate",
+              "sidebar": undefined,
+            },
             {
               "id": "doc with space",
               "path": "/docs/doc with space",
@@ -1061,6 +1157,16 @@ exports[`simple website content: global data 1`] = `
               "path": "/docs/ipsum",
               "sidebar": undefined,
             },
+            {
+              "id": "lastUpdateAuthorOnly",
+              "path": "/docs/lastUpdateAuthorOnly",
+              "sidebar": undefined,
+            },
+            {
+              "id": "lastUpdateDateOnly",
+              "path": "/docs/lastUpdateDateOnly",
+              "sidebar": undefined,
+            },
             {
               "id": "lorem",
               "path": "/docs/lorem",
@@ -1202,6 +1308,14 @@ exports[`simple website content: route config 1`] = `
         "path": "/docs/category/slugs",
         "sidebar": "docs",
       },
+      {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": {
+          "content": "@site/docs/customLastUpdate.md",
+        },
+        "path": "/docs/customLastUpdate",
+      },
       {
         "component": "@theme/DocItem",
         "exact": true,
@@ -1262,6 +1376,22 @@ exports[`simple website content: route config 1`] = `
         },
         "path": "/docs/ipsum",
       },
+      {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": {
+          "content": "@site/docs/lastUpdateAuthorOnly.md",
+        },
+        "path": "/docs/lastUpdateAuthorOnly",
+      },
+      {
+        "component": "@theme/DocItem",
+        "exact": true,
+        "modules": {
+          "content": "@site/docs/lastUpdateDateOnly.md",
+        },
+        "path": "/docs/lastUpdateDateOnly",
+      },
       {
         "component": "@theme/DocItem",
         "exact": true,
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
index 9a338c5bf9d2..88b74733f7ce 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
@@ -57,7 +57,6 @@ ${markdown}
   return {
     source,
     content,
-    lastUpdate: {},
     contentPath: 'docs',
     filePath: source,
   };
@@ -79,7 +78,7 @@ function createTestUtils({
   env = 'production',
 }: TestUtilsArg) {
   async function readDoc(docFileSource: string) {
-    return readDocFile(versionMetadata, docFileSource, options);
+    return readDocFile(versionMetadata, docFileSource);
   }
   async function processDocFile(docFileArg: DocFile | string) {
     const docFile: DocFile =
@@ -119,7 +118,7 @@ function createTestUtils({
 
   async function testSlug(docFileSource: string, expectedPermalink: string) {
     const docFile = await readDoc(docFileSource);
-    const metadata = processDocMetadata({
+    const metadata = await processDocMetadata({
       docFile,
       versionMetadata,
       context,
@@ -137,14 +136,16 @@ function createTestUtils({
     }[];
     sidebars: Sidebars;
   }> {
-    const rawDocs = docFiles.map((docFile) =>
-      processDocMetadata({
-        docFile,
-        versionMetadata,
-        context,
-        options,
-        env: 'production',
-      }),
+    const rawDocs = await Promise.all(
+      docFiles.map(async (docFile) =>
+        processDocMetadata({
+          docFile,
+          versionMetadata,
+          context,
+          options,
+          env: 'production',
+        }),
+      ),
     );
     const sidebars = await loadSidebars(versionMetadata.sidebarFilePath, {
       sidebarItemsGenerator: ({defaultSidebarItemsGenerator, ...args}) =>
@@ -230,6 +231,9 @@ describe('simple site', () => {
         'headingAsTitle.md',
         'doc with space.md',
         'doc-draft.md',
+        'customLastUpdate.md',
+        'lastUpdateAuthorOnly.md',
+        'lastUpdateDateOnly.md',
         'foo/bar.md',
         'foo/baz.md',
         'slugs/absoluteSlug.md',
@@ -481,6 +485,164 @@ describe('simple site', () => {
     });
   });
 
+  it('docs with last_update front matter', async () => {
+    const {siteDir, context, options, currentVersion, createTestUtilsPartial} =
+      await loadSite({
+        options: {
+          showLastUpdateAuthor: true,
+          showLastUpdateTime: true,
+        },
+      });
+
+    const testUtilsLocal = createTestUtilsPartial({
+      siteDir,
+      context,
+      options,
+      versionMetadata: currentVersion,
+    });
+
+    await testUtilsLocal.testMeta('customLastUpdate.md', {
+      version: 'current',
+      id: 'customLastUpdate',
+      unversionedId: 'customLastUpdate',
+      sourceDirName: '.',
+      permalink: '/docs/customLastUpdate',
+      slug: '/customLastUpdate',
+      title: 'Custom Last Update',
+      description: 'Custom last update',
+      frontMatter: {
+        last_update: {
+          author: 'Custom Author',
+          date: '1/1/2000',
+        },
+        title: 'Custom Last Update',
+      },
+      lastUpdatedAt: new Date('1/1/2000').getTime() / 1000,
+      formattedLastUpdatedAt: '1/1/2000',
+      lastUpdatedBy: 'Custom Author',
+      sidebarPosition: undefined,
+      tags: [],
+    });
+  });
+
+  it('docs with only last_update author front matter', async () => {
+    const {siteDir, context, options, currentVersion, createTestUtilsPartial} =
+      await loadSite({
+        options: {
+          showLastUpdateAuthor: true,
+          showLastUpdateTime: true,
+        },
+      });
+
+    const testUtilsLocal = createTestUtilsPartial({
+      siteDir,
+      context,
+      options,
+      versionMetadata: currentVersion,
+    });
+
+    await testUtilsLocal.testMeta('lastUpdateAuthorOnly.md', {
+      version: 'current',
+      id: 'lastUpdateAuthorOnly',
+      unversionedId: 'lastUpdateAuthorOnly',
+      sourceDirName: '.',
+      permalink: '/docs/lastUpdateAuthorOnly',
+      slug: '/lastUpdateAuthorOnly',
+      title: 'Last Update Author Only',
+      description: 'Only custom author, so it will still use the date from Git',
+      frontMatter: {
+        last_update: {
+          author: 'Custom Author',
+        },
+        title: 'Last Update Author Only',
+      },
+      lastUpdatedAt: 1539502055,
+      formattedLastUpdatedAt: '10/14/2018',
+      lastUpdatedBy: 'Custom Author',
+      sidebarPosition: undefined,
+      tags: [],
+    });
+  });
+
+  it('docs with only last_update date front matter', async () => {
+    const {siteDir, context, options, currentVersion, createTestUtilsPartial} =
+      await loadSite({
+        options: {
+          showLastUpdateAuthor: true,
+          showLastUpdateTime: true,
+        },
+      });
+
+    const testUtilsLocal = createTestUtilsPartial({
+      siteDir,
+      context,
+      options,
+      versionMetadata: currentVersion,
+    });
+
+    await testUtilsLocal.testMeta('lastUpdateDateOnly.md', {
+      version: 'current',
+      id: 'lastUpdateDateOnly',
+      unversionedId: 'lastUpdateDateOnly',
+      sourceDirName: '.',
+      permalink: '/docs/lastUpdateDateOnly',
+      slug: '/lastUpdateDateOnly',
+      title: 'Last Update Date Only',
+      description: 'Only custom date, so it will still use the author from Git',
+      frontMatter: {
+        last_update: {
+          date: '1/1/2000',
+        },
+        title: 'Last Update Date Only',
+      },
+      lastUpdatedAt: new Date('1/1/2000').getTime() / 1000,
+      formattedLastUpdatedAt: '1/1/2000',
+      lastUpdatedBy: 'Author',
+      sidebarPosition: undefined,
+      tags: [],
+    });
+  });
+
+  it('docs with last_update front matter disabled', async () => {
+    const {siteDir, context, options, currentVersion, createTestUtilsPartial} =
+      await loadSite({
+        options: {
+          showLastUpdateAuthor: false,
+          showLastUpdateTime: false,
+        },
+      });
+
+    const testUtilsLocal = createTestUtilsPartial({
+      siteDir,
+      context,
+      options,
+      versionMetadata: currentVersion,
+    });
+
+    await testUtilsLocal.testMeta('customLastUpdate.md', {
+      version: 'current',
+      id: 'customLastUpdate',
+      unversionedId: 'customLastUpdate',
+      sourceDirName: '.',
+      permalink: '/docs/customLastUpdate',
+      slug: '/customLastUpdate',
+      title: 'Custom Last Update',
+      description: 'Custom last update',
+      frontMatter: {
+        last_update: {
+          author: 'Custom Author',
+          date: '1/1/2000',
+        },
+        title: 'Custom Last Update',
+      },
+      lastUpdatedAt: undefined,
+      formattedLastUpdatedAt: undefined,
+      lastUpdatedBy: undefined,
+      sidebarPosition: undefined,
+      tags: [],
+    });
+  });
+
   it('docs with slugs', async () => {
     const {defaultTestUtils} = await loadSite();
 
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
index 81eedbf13b9a..55da1682c725 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
@@ -396,3 +396,52 @@ describe('validateDocFrontMatter draft', () => {
     ],
   });
 });
+
+describe('validateDocFrontMatter last_update', () => {
+  testField({
+    prefix: 'last_update',
+    validFrontMatters: [
+      {last_update: undefined},
+      {last_update: {author: 'test author', date: undefined}},
+      {last_update: {author: undefined, date: '1/1/2000'}},
+      {last_update: {author: undefined, date: new Date('1/1/2000')}},
+      {last_update: {author: 'test author', date: '1/1/2000'}},
+      {last_update: {author: 'test author', date: '1995-12-17T03:24:00'}},
+      {last_update: {author: undefined, date: 'December 17, 1995 03:24:00'}},
+    ],
+    invalidFrontMatters: [
+      [
+        {last_update: null},
+        'does not look like a valid front matter FileChange object. Please use a FileChange object (with an author and/or date).',
+      ],
+      [
+        {last_update: {}},
+        'does not look like a valid front matter FileChange object. Please use a FileChange object (with an author and/or date).',
+      ],
+      [
+        {last_update: ''},
+        'does not look like a valid front matter FileChange object. Please use a FileChange object (with an author and/or date).',
+      ],
+      [
+        {last_update: {invalid: 'key'}},
+        'does not look like a valid front matter FileChange object. Please use a FileChange object (with an author and/or date).',
+      ],
+      [
+        {last_update: {author: 'test author', date: 'I am not a date :('}},
+        'must be a valid date',
+      ],
+      [
+        {last_update: {author: 'test author', date: '2011-10-45'}},
+        'must be a valid date',
+      ],
+      [
+        {last_update: {author: 'test author', date: '2011-0-10'}},
+        'must be a valid date',
+      ],
+      [
+        {last_update: {author: 'test author', date: ''}},
+        'must be a valid date',
+      ],
+    ],
+  });
+});
diff --git a/packages/docusaurus-plugin-content-docs/src/docs.ts b/packages/docusaurus-plugin-content-docs/src/docs.ts
index 2ea127f99fbb..580d90101740 100644
--- a/packages/docusaurus-plugin-content-docs/src/docs.ts
+++ b/packages/docusaurus-plugin-content-docs/src/docs.ts
@@ -37,6 +37,7 @@ import type {
   VersionMetadata,
   DocFrontMatter,
   LoadedVersion,
+  FileChange,
 } from '@docusaurus/plugin-content-docs';
 import type {LoadContext} from '@docusaurus/types';
 import type {SidebarsUtils} from './sidebars/utils';
@@ -50,9 +51,21 @@ type LastUpdateOptions = Pick<
 async function readLastUpdateData(
   filePath: string,
   options: LastUpdateOptions,
+  lastUpdateFrontMatter: FileChange | undefined,
 ): Promise<LastUpdateData> {
   const {showLastUpdateAuthor, showLastUpdateTime} = options;
   if (showLastUpdateAuthor || showLastUpdateTime) {
+    const frontMatterTimestamp = lastUpdateFrontMatter?.date
+      ? new Date(lastUpdateFrontMatter.date).getTime() / 1000
+      : undefined;
+
+    if (lastUpdateFrontMatter?.author && lastUpdateFrontMatter.date) {
+      return {
+        lastUpdatedAt: frontMatterTimestamp,
+        lastUpdatedBy: lastUpdateFrontMatter.author,
+      };
+    }
+
     // Use fake data in dev for faster development.
     const fileLastUpdateData =
       process.env.NODE_ENV === 'production'
@@ -61,14 +74,16 @@ async function readLastUpdateData(
             author: 'Author',
             timestamp: 1539502055,
           };
-
-    if (fileLastUpdateData) {
-      const {author, timestamp} = fileLastUpdateData;
-      return {
-        lastUpdatedAt: showLastUpdateTime ? timestamp : undefined,
-        lastUpdatedBy: showLastUpdateAuthor ? author : undefined,
-      };
-    }
+    const {author, timestamp} = fileLastUpdateData ?? {};
+
+    return {
+      lastUpdatedBy: showLastUpdateAuthor
+        ? lastUpdateFrontMatter?.author ?? author
+        : undefined,
+      lastUpdatedAt: showLastUpdateTime
+        ? frontMatterTimestamp ?? timestamp
+        : undefined,
+    };
   }
 
   return {};
@@ -80,7 +95,6 @@ export async function readDocFile(
     'contentPath' | 'contentPathLocalized'
   >,
   source: string,
-  options: LastUpdateOptions,
 ): Promise<DocFile> {
   const contentPath = await getFolderContainingFile(
     getContentPathList(versionMetadata),
@@ -89,11 +103,8 @@ export async function readDocFile(
 
   const filePath = path.join(contentPath, source);
 
-  const [content, lastUpdate] = await Promise.all([
-    fs.readFile(filePath, 'utf-8'),
-    readLastUpdateData(filePath, options),
-  ]);
-  return {source, content, lastUpdate, contentPath, filePath};
+  const content = await fs.readFile(filePath, 'utf-8');
+  return {source, content, contentPath, filePath};
 }
 
 export async function readVersionDocs(
@@ -108,7 +119,7 @@ export async function readVersionDocs(
     ignore: options.exclude,
   });
   return Promise.all(
-    sources.map((source) => readDocFile(versionMetadata, source, options)),
+    sources.map((source) => readDocFile(versionMetadata, source)),
   );
 }
 
@@ -125,7 +136,7 @@ function isDraftForEnvironment({
   return (env === 'production' && frontMatter.draft) ?? false;
 }
 
-function doProcessDocMetadata({
+async function doProcessDocMetadata({
   docFile,
   versionMetadata,
   context,
@@ -137,8 +148,8 @@ function doProcessDocMetadata({
   context: LoadContext;
   options: MetadataOptions;
   env: DocEnv;
-}): DocMetadataBase {
-  const {source, content, lastUpdate, contentPath, filePath} = docFile;
+}): Promise<DocMetadataBase> {
+  const {source, content, contentPath, filePath} = docFile;
   const {siteDir, i18n} = context;
 
   const {
@@ -155,8 +166,15 @@ function doProcessDocMetadata({
     // (01-MyFolder/01-MyDoc.md => MyFolder/MyDoc)
     // but allow to disable this behavior with front matter
     parse_number_prefixes: parseNumberPrefixes = true,
+    last_update: lastUpdateFrontMatter,
   } = frontMatter;
 
+  const lastUpdate = await readLastUpdateData(
+    filePath,
+    options,
+    lastUpdateFrontMatter,
+  );
+
   // E.g. api/plugins/myDoc -> myDoc; myDoc -> myDoc
   const sourceFileNameWithoutExtension = path.basename(
     source,
@@ -287,7 +305,7 @@ export function processDocMetadata(args: {
   context: LoadContext;
   options: MetadataOptions;
   env: DocEnv;
-}): DocMetadataBase {
+}): Promise<DocMetadataBase> {
   try {
     return doProcessDocMetadata(args);
   } catch (err) {
diff --git a/packages/docusaurus-plugin-content-docs/src/frontMatter.ts b/packages/docusaurus-plugin-content-docs/src/frontMatter.ts
index de944a6b1716..9d210a831b25 100644
--- a/packages/docusaurus-plugin-content-docs/src/frontMatter.ts
+++ b/packages/docusaurus-plugin-content-docs/src/frontMatter.ts
@@ -14,6 +14,9 @@ import {
 } from '@docusaurus/utils-validation';
 import type {DocFrontMatter} from '@docusaurus/plugin-content-docs';
 
+const FrontMatterLastUpdateErrorMessage =
+  '{{#label}} does not look like a valid front matter FileChange object. Please use a FileChange object (with an author and/or date).';
+
 // NOTE: we don't add any default value on purpose here
 // We don't want default values to magically appear in doc metadata and props
 // While the user did not provide those values explicitly
@@ -42,6 +45,15 @@ const DocFrontMatterSchema = Joi.object<DocFrontMatter>({
   pagination_prev: Joi.string().allow(null),
   draft: Joi.boolean(),
   ...FrontMatterTOCHeadingLevels,
+  last_update: Joi.object({
+    author: Joi.string(),
+    date: Joi.date().raw(),
+  })
+    .or('author', 'date')
+    .messages({
+      'object.missing': FrontMatterLastUpdateErrorMessage,
+      'object.base': FrontMatterLastUpdateErrorMessage,
+    }),
 }).unknown();
 
 export function validateDocFrontMatter(frontMatter: {
diff --git a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
index 1d7be06b74dc..835c87204375 100644
--- a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
+++ b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
@@ -23,6 +23,14 @@ declare module '@docusaurus/plugin-content-docs' {
     image?: string;
   };
 
+  export type FileChange = {
+    author?: string;
+    /** Date can be any
+     * [parsable date string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse).
+     */
+    date?: Date | string;
+  };
+
   /**
    * Custom callback for parsing number prefixes from file/folder names.
    */
@@ -371,6 +379,8 @@ declare module '@docusaurus/plugin-content-docs' {
     pagination_prev?: string | null;
     /** Should this doc be excluded from production builds? */
     draft?: boolean;
+    /** Allows overriding the last updated author and/or date. */
+    last_update?: FileChange;
   };
 
   export type LastUpdateData = {
diff --git a/packages/docusaurus-plugin-content-docs/src/types.ts b/packages/docusaurus-plugin-content-docs/src/types.ts
index cb4506b20d1a..4c4568517fbb 100644
--- a/packages/docusaurus-plugin-content-docs/src/types.ts
+++ b/packages/docusaurus-plugin-content-docs/src/types.ts
@@ -8,7 +8,6 @@
 import type {BrokenMarkdownLink, Tag} from '@docusaurus/utils';
 import type {
   VersionMetadata,
-  LastUpdateData,
   LoadedVersion,
   CategoryGeneratedIndexMetadata,
 } from '@docusaurus/plugin-content-docs';
@@ -19,7 +18,6 @@ export type DocFile = {
   filePath: string; // /!\ may be localized
   source: string;
   content: string;
-  lastUpdate: LastUpdateData;
 };
 
 export type SourceToPermalink = {
diff --git a/website/_dogfooding/_docs tests/doc-with-last-update.md b/website/_dogfooding/_docs tests/doc-with-last-update.md
new file mode 100644
index 000000000000..34c1cb0c7cb6
--- /dev/null
+++ b/website/_dogfooding/_docs tests/doc-with-last-update.md	
@@ -0,0 +1,7 @@
+---
+last_update:
+  author: custom author
+  date: 1/1/2000
+---
+
+# Doc With Last Update Front Matter
diff --git a/website/_dogfooding/docs-tests-sidebars.js b/website/_dogfooding/docs-tests-sidebars.js
index e7ebb55ce1a5..0c2783feeda3 100644
--- a/website/_dogfooding/docs-tests-sidebars.js
+++ b/website/_dogfooding/docs-tests-sidebars.js
@@ -22,6 +22,7 @@ const sidebars = {
     'test-draft',
     'doc-without-sidebar',
     'doc-with-another-sidebar',
+    'doc-with-last-update',
     {
       type: 'category',
       label: 'Tests',
diff --git a/website/_dogfooding/dogfooding.config.js b/website/_dogfooding/dogfooding.config.js
index b6239f787b42..f8a4e7007f0e 100644
--- a/website/_dogfooding/dogfooding.config.js
+++ b/website/_dogfooding/dogfooding.config.js
@@ -30,6 +30,7 @@ const dogfoodingPluginInstances = [
       // 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,
+      showLastUpdateAuthor: true,
       sidebarItemsGenerator(args) {
         return args.defaultSidebarItemsGenerator({
           ...args,
diff --git a/website/docs/api/plugins/plugin-content-docs.md b/website/docs/api/plugins/plugin-content-docs.md
index 4b7deaff16d6..aaec7289daf1 100644
--- a/website/docs/api/plugins/plugin-content-docs.md
+++ b/website/docs/api/plugins/plugin-content-docs.md
@@ -281,6 +281,7 @@ Accepted fields:
 | `slug` | `string` | File path | Allows to customize the document url (`/<routeBasePath>/<slug>`). Support multiple patterns: `slug: my-doc`, `slug: /my/path/myDoc`, `slug: /`. |
 | `tags` | `Tag[]` | `undefined` | A list of strings or objects of two string fields `label` and `permalink` to tag to your docs. |
 | `draft` | `boolean` | `false` | A boolean flag to indicate that a document is a work-in-progress. Draft documents will only be displayed during development. |
+| `last_update` | `FileChange` | `undefined` | Allows overriding the last updated author and/or date. Date can be any [parsable date string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse). |
 
 </APITable>
 
@@ -288,6 +289,10 @@ Accepted fields:
 type Tag = string | {label: string; permalink: string};
 ```
 
+```ts
+type FileChange = {date: string; author: string};
+```
+
 Example:
 
 ```md
@@ -306,6 +311,9 @@ keywords:
   - docusaurus
 image: https://i.imgur.com/mErPwqL.png
 slug: /myDoc
+last_update:
+  date: 1/1/2000
+  author: custom author name
 ---
 
 # Markdown Features

From 6afc902672434027ddaabf0cd05584900c2981d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= <slorber@users.noreply.github.com>
Date: Thu, 2 Jun 2022 10:09:00 +0200
Subject: [PATCH 41/43] chore: update static-site-generator-webpack-plugin
 (#7547)

---
 packages/docusaurus/package.json          |   2 +-
 packages/docusaurus/src/deps.d.ts         |   1 +
 packages/docusaurus/src/webpack/server.ts |   6 +
 yarn.lock                                 | 197 +---------------------
 4 files changed, 17 insertions(+), 189 deletions(-)

diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index 40218c38797a..fcc26af6e257 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -50,7 +50,7 @@
     "@docusaurus/utils": "2.0.0-beta.21",
     "@docusaurus/utils-common": "2.0.0-beta.21",
     "@docusaurus/utils-validation": "2.0.0-beta.21",
-    "@slorber/static-site-generator-webpack-plugin": "^4.0.4",
+    "@slorber/static-site-generator-webpack-plugin": "^4.0.7",
     "@svgr/webpack": "^6.2.1",
     "autoprefixer": "^10.4.7",
     "babel-loader": "^8.2.5",
diff --git a/packages/docusaurus/src/deps.d.ts b/packages/docusaurus/src/deps.d.ts
index 57de485ea0ce..c70f6b8b54b4 100644
--- a/packages/docusaurus/src/deps.d.ts
+++ b/packages/docusaurus/src/deps.d.ts
@@ -64,6 +64,7 @@ declare module '@slorber/static-site-generator-webpack-plugin' {
       paths: string[];
       preferFoldersOutput?: boolean;
       globals: {[key: string]: unknown};
+      concurrency?: number;
     });
     apply(compiler: Compiler): void;
   }
diff --git a/packages/docusaurus/src/webpack/server.ts b/packages/docusaurus/src/webpack/server.ts
index 7f93c86a4bb9..4942ed5c0c76 100644
--- a/packages/docusaurus/src/webpack/server.ts
+++ b/packages/docusaurus/src/webpack/server.ts
@@ -90,6 +90,12 @@ export default async function createServerConfig({
         // has any importance for this plugin, just using an empty string to
         // avoid the error. See https://github.com/facebook/docusaurus/issues/4922
         globals: {__filename: ''},
+
+        // Secret way to set SSR plugin concurrency option
+        // Waiting for feedback before documenting this officially?
+        concurrency: process.env.DOCUSAURUS_SSR_CONCURRENCY
+          ? parseInt(process.env.DOCUSAURUS_SSR_CONCURRENCY, 10)
+          : undefined,
       }),
 
       // Show compilation progress bar.
diff --git a/yarn.lock b/yarn.lock
index abc15d47e10c..74fde4aecb87 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2994,15 +2994,14 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@slorber/static-site-generator-webpack-plugin@^4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.4.tgz#2bf4a2545e027830d2aa5eb950437c26a289b0f1"
-  integrity sha512-FvMavoWEIePps6/JwGCOLYKCRhuwIHhMtmbKpBFgzNkxwpa/569LfTkrbRk1m1I3n+ezJK4on9E1A6cjuZmD9g==
+"@slorber/static-site-generator-webpack-plugin@^4.0.7":
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/@slorber/static-site-generator-webpack-plugin/-/static-site-generator-webpack-plugin-4.0.7.tgz#fc1678bddefab014e2145cbe25b3ce4e1cfc36f3"
+  integrity sha512-Ug7x6z5lwrz0WqdnNFOMYrDQNTPAprvHLSh6+/fmml3qUiz6l5eq+2MzLKWtn/q5K5NpSiFsZTP/fck/3vjSxA==
   dependencies:
-    bluebird "^3.7.1"
-    cheerio "^0.22.0"
     eval "^0.1.8"
-    webpack-sources "^1.4.3"
+    p-map "^4.0.0"
+    webpack-sources "^3.2.2"
 
 "@surma/rollup-plugin-off-main-thread@^2.2.3":
   version "2.2.3"
@@ -4842,11 +4841,6 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird@^3.7.1:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
-  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
-
 bluebird@~3.4.1:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
@@ -4880,7 +4874,7 @@ bonjour-service@^1.0.11:
     fast-deep-equal "^3.1.3"
     multicast-dns "^7.2.4"
 
-boolbase@^1.0.0, boolbase@~1.0.0:
+boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
@@ -5275,28 +5269,6 @@ cheerio-select@^2.1.0:
     domhandler "^5.0.3"
     domutils "^3.0.1"
 
-cheerio@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
-  integrity sha512-8/MzidM6G/TgRelkzDG13y3Y9LxBjCb+8yOEZ9+wwq5gVF2w2pV0wmHvjfT0RvuxGyR7UEuK36r+yYMbT4uKgA==
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.0"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash.assignin "^4.0.9"
-    lodash.bind "^4.1.4"
-    lodash.defaults "^4.0.1"
-    lodash.filter "^4.4.0"
-    lodash.flatten "^4.2.0"
-    lodash.foreach "^4.3.0"
-    lodash.map "^4.4.0"
-    lodash.merge "^4.4.0"
-    lodash.pick "^4.2.1"
-    lodash.reduce "^4.4.0"
-    lodash.reject "^4.4.0"
-    lodash.some "^4.4.0"
-
 cheerio@^1.0.0-rc.11:
   version "1.0.0-rc.11"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.11.tgz#1be84be1a126958366bcc57a11648cd9b30a60c2"
@@ -6138,16 +6110,6 @@ css-select@^5.1.0:
     domutils "^3.0.1"
     nth-check "^2.0.1"
 
-css-select@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha512-dUQOBoqdR7QwV90WysXPLXG5LO7nhYBgiWVfxF80DKPF8zx1t/pUd2FYy73emg3zrjtM6dzmYgbHKfV2rxiHQA==
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
-
 css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
@@ -6156,11 +6118,6 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
-
 css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
@@ -6580,14 +6537,6 @@ dom-iterator@^1.0.0:
     component-props "1.1.1"
     component-xor "0.0.4"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
 dom-serializer@^1.0.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
@@ -6606,19 +6555,6 @@ dom-serializer@^2.0.0:
     domhandler "^5.0.2"
     entities "^4.2.0"
 
-dom-serializer@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
-  dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
-
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
 domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
@@ -6631,13 +6567,6 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
 domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
@@ -6652,22 +6581,6 @@ domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
@@ -6799,11 +6712,6 @@ enhanced-resolve@^5.9.3:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-entities@^1.1.1, entities@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
@@ -8451,18 +8359,6 @@ html-webpack-plugin@^5.5.0:
     pretty-error "^4.0.0"
     tapable "^2.0.0"
 
-htmlparser2@^3.9.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
 htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
@@ -10185,16 +10081,6 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
 
-lodash.assignin@^4.0.9:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==
-
-lodash.bind@^4.1.4:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
-  integrity sha512-lxdsn7xxlCymgLYo1gGvVrfHmkjDiyqVv62FAeF2i5ta72BipE1SLxw8hPEPLhD4/247Ijw07UQH7Hq/chT5LA==
-
 lodash.curry@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
@@ -10205,71 +10091,26 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
-lodash.defaults@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
-
-lodash.filter@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
-  integrity sha512-pXYUy7PR8BCLwX5mgJ/aNtyOvuJTdZAo9EQFUvMIYugqmJxnrYaANvTbgndOzHSCSR0wnlBBfRXJL5SbWxo3FQ==
-
-lodash.flatten@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
-
 lodash.flow@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
   integrity sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==
 
-lodash.foreach@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
   integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==
 
-lodash.map@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-  integrity sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==
-
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
-lodash.merge@^4.4.0, lodash.merge@^4.6.2:
+lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-  integrity sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==
-
-lodash.reduce@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
-  integrity sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==
-
-lodash.reject@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
-  integrity sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ==
-
-lodash.some@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
-  integrity sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==
-
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
@@ -11278,13 +11119,6 @@ nth-check@^2.0.1:
   dependencies:
     boolbase "^1.0.0"
 
-nth-check@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
-  dependencies:
-    boolbase "~1.0.0"
-
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -13919,11 +13753,6 @@ sort-keys@^4.0.0:
   dependencies:
     is-plain-obj "^2.0.0"
 
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -15641,15 +15470,7 @@ webpack-merge@^5.8.0:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-sources@^3.2.3:
+webpack-sources@^3.2.2, webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==

From f25ee0cbf581cc620dbbb03a577d7fc7c74f750a Mon Sep 17 00:00:00 2001
From: JP <jpdriver@users.noreply.github.com>
Date: Thu, 2 Jun 2022 01:34:20 -0700
Subject: [PATCH 42/43] feat(live-codeblock): add support for noInline to
 interactive code blocks (#7514)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sébastien Lorber <slorber@users.noreply.github.com>
---
 .../src/theme-live-codeblock.d.ts             |  8 ++++-
 .../src/theme/Playground/index.tsx            |  3 ++
 .../markdown-features-code-blocks.mdx         | 36 +++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/packages/docusaurus-theme-live-codeblock/src/theme-live-codeblock.d.ts b/packages/docusaurus-theme-live-codeblock/src/theme-live-codeblock.d.ts
index 5bb5e51d2d26..b4dd299705cd 100644
--- a/packages/docusaurus-theme-live-codeblock/src/theme-live-codeblock.d.ts
+++ b/packages/docusaurus-theme-live-codeblock/src/theme-live-codeblock.d.ts
@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+/// <reference types="@docusaurus/theme-classic" />
+/// <reference types="@docusaurus/module-type-aliases" />
+
 declare module '@docusaurus/theme-live-codeblock' {
   export type ThemeConfig = {
     liveCodeBlock: {
@@ -14,9 +17,12 @@ declare module '@docusaurus/theme-live-codeblock' {
 }
 
 declare module '@theme/Playground' {
+  import type {Props as BaseProps} from '@theme/CodeBlock';
   import type {LiveProviderProps} from 'react-live';
 
-  export interface Props extends LiveProviderProps {
+  type CodeBlockProps = Omit<BaseProps, 'className' | 'language' | 'title'>;
+
+  export interface Props extends CodeBlockProps, LiveProviderProps {
     children: string;
   }
   export default function Playground(props: LiveProviderProps): JSX.Element;
diff --git a/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx b/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
index ef5c0f0f4ff9..81fa2ea65b0a 100644
--- a/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
+++ b/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
@@ -93,11 +93,14 @@ export default function Playground({
   } = themeConfig as ThemeConfig;
   const prismTheme = usePrismTheme();
 
+  const noInline = props.metastring?.includes('noInline') ?? false;
+
   return (
     <div className={styles.playgroundContainer}>
       {/* @ts-expect-error: type incompatibility with refs */}
       <LiveProvider
         code={children.replace(/\n$/, '')}
+        noInline={noInline}
         transformCode={transformCode ?? ((code) => `${code};`)}
         theme={prismTheme}
         {...props}>
diff --git a/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx b/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
index 2eaaf21837c8..15a30c528017 100644
--- a/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
+++ b/website/docs/guides/markdown-features/markdown-features-code-blocks.mdx
@@ -569,6 +569,42 @@ function MyPlayground(props) {
 </BrowserWindow>
 ```
 
+### Imperative Rendering (noInline)
+
+The `noInline` option should be used to avoid errors when your code spans multiple components or variables.
+
+````md
+```jsx live noInline
+const project = 'Docusaurus';
+
+const Greeting = () => <p>Hello {project}!</p>;
+
+render(<Greeting />);
+```
+````
+
+Unlike an ordinary interactive code block, when using `noInline` React Live won't wrap your code in an inline function to render it.
+
+You will need to explicitly call `render()` at the end of your code to display the output.
+
+````mdx-code-block
+<BrowserWindow>
+
+```jsx live noInline
+const project = "Docusaurus";
+
+const Greeting = () => (
+  <p>Hello {project}!</p>
+);
+
+render(
+  <Greeting />
+);
+```
+
+</BrowserWindow>
+````
+
 ## Using JSX markup in code blocks {#using-jsx-markup}
 
 Code block in Markdown always preserves its content as plain text, meaning you can't do something like:

From 1efcfc4671efde8ca4cfc9ebe67942141ec880cc Mon Sep 17 00:00:00 2001
From: Lane Goolsby <lanegoolsby@yahoo.com>
Date: Thu, 2 Jun 2022 03:47:52 -0700
Subject: [PATCH 43/43] feat(analytics): allow query/hash changes to be sent to
 GA (#7545)

Co-authored-by: Lane Goolsby <lanegoolsby@rocketmortgage.com>
---
 .../src/analytics.ts                           | 13 +++++++++++--
 .../docusaurus-plugin-google-gtag/src/gtag.ts  | 18 +++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/docusaurus-plugin-google-analytics/src/analytics.ts b/packages/docusaurus-plugin-google-analytics/src/analytics.ts
index 82e957701c3a..b127d3c43c81 100644
--- a/packages/docusaurus-plugin-google-analytics/src/analytics.ts
+++ b/packages/docusaurus-plugin-google-analytics/src/analytics.ts
@@ -9,10 +9,19 @@ import type {ClientModule} from '@docusaurus/types';
 
 const clientModule: ClientModule = {
   onRouteDidUpdate({location, previousLocation}) {
-    if (previousLocation && location.pathname !== previousLocation.pathname) {
+    if (
+      previousLocation &&
+      (location.pathname !== previousLocation.pathname ||
+        location.search !== previousLocation.search ||
+        location.hash !== previousLocation.hash)
+    ) {
       // Set page so that subsequent hits on this page are attributed
       // to this page. This is recommended for Single-page Applications.
-      window.ga('set', 'page', location.pathname);
+      window.ga(
+        'set',
+        'page',
+        location.pathname + location.search + location.hash,
+      );
       // Always refer to the variable on window in-case it gets
       // overridden elsewhere.
       window.ga('send', 'pageview');
diff --git a/packages/docusaurus-plugin-google-gtag/src/gtag.ts b/packages/docusaurus-plugin-google-gtag/src/gtag.ts
index 2122511126a8..4092fa8f0fcd 100644
--- a/packages/docusaurus-plugin-google-gtag/src/gtag.ts
+++ b/packages/docusaurus-plugin-google-gtag/src/gtag.ts
@@ -5,16 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import globalData from '@generated/globalData';
-import type {PluginOptions} from './options';
 import type {ClientModule} from '@docusaurus/types';
 
-const {trackingID} = globalData['docusaurus-plugin-google-gtag']!
-  .default as PluginOptions;
-
 const clientModule: ClientModule = {
   onRouteDidUpdate({location, previousLocation}) {
-    if (previousLocation && location.pathname !== previousLocation.pathname) {
+    if (
+      previousLocation &&
+      (location.pathname !== previousLocation.pathname ||
+        location.search !== previousLocation.search ||
+        location.hash !== previousLocation.hash)
+    ) {
       // Normally, the document title is updated in the next tick due to how
       // `react-helmet-async` updates it. We want to send the current document's
       // title to gtag instead of the old one's, so we use `setTimeout` to defer
@@ -23,14 +23,10 @@ const clientModule: ClientModule = {
       setTimeout(() => {
         // Always refer to the variable on window in case it gets overridden
         // elsewhere.
-        window.gtag('config', trackingID, {
-          page_path: location.pathname,
-          page_title: document.title,
-        });
         window.gtag('event', 'page_view', {
           page_title: document.title,
           page_location: window.location.href,
-          page_path: location.pathname,
+          page_path: location.pathname + location.search + location.hash,
         });
       });
     }