diff --git a/.eslintrc.js b/.eslintrc.js
index d8b7a4584e..4dc985f0d9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -220,7 +220,35 @@ module.exports = {
         ],
       },
     ],
-    'import/order': OFF,
+    'import/order': [
+      WARNING,
+      {
+        groups: [
+          'builtin',
+          'external',
+          'internal',
+          ['parent', 'sibling', 'index'],
+          'type',
+        ],
+        pathGroups: [
+          {pattern: '@jest/globals', group: 'builtin', position: 'before'},
+          {pattern: 'react', group: 'builtin', position: 'before'},
+          {pattern: 'fs-extra', group: 'builtin'},
+          {pattern: 'lodash', group: 'external', position: 'before'},
+          {pattern: 'clsx', group: 'external', position: 'before'},
+          // 'Bit weird to not use the `import/internal-regex` option, but this
+          // way, we can make `import type { Props } from "@theme/*"` appear
+          // before `import styles from "styles.module.css"`, which is what we
+          // always did. This should be removable once we stop using ambient
+          // module declarations for theme aliases.
+          {pattern: '@theme/**', group: 'internal'},
+          {pattern: '@site/**', group: 'internal'},
+          {pattern: '@theme-init/**', group: 'internal'},
+          {pattern: '@theme-original/**', group: 'internal'},
+        ],
+        pathGroupsExcludedImportTypes: [],
+      },
+    ],
     'import/prefer-default-export': OFF,
 
     'jest/consistent-test-it': WARNING,
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ff8708bf01..0635bad2a5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,4 +6,4 @@ updates:
       interval: weekly
     open-pull-requests-limit: 99
     labels:
-      - 'tag: dependencies'
+      - 'pr: dependencies'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 305588ca1a..4fb9c9ab40 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@7502d6e991ca767d2db617bfd823a1ed925a0d59 # v2
+        uses: github/codeql-action/init@75b4f1c4669133dc294b06c2794e969efa2e5316 # v2
         with:
           languages: ${{ matrix.language }}
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7502d6e991ca767d2db617bfd823a1ed925a0d59 # v2
+        uses: github/codeql-action/analyze@75b4f1c4669133dc294b06c2794e969efa2e5316 # v2
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 12ac3025e4..ff675761f2 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,7 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint-staged --allow-empty
+# Workaround of a mysterious bug in either lint-staged or husky.
+# https://github.com/typicode/husky/issues/1134
+# https://github.com/okonet/lint-staged/issues/693#issuecomment-1079759224
+FORCE_COLOR=1 yarn lint-staged --allow-empty
diff --git a/__tests__/validate-package-json.test.ts b/__tests__/validate-package-json.test.ts
index 8598d7b892..f6003be9ba 100644
--- a/__tests__/validate-package-json.test.ts
+++ b/__tests__/validate-package-json.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {Globby} from '@docusaurus/utils';
 import fs from 'fs-extra';
+import {Globby} from '@docusaurus/utils';
 
 type PackageJsonFile = {
   file: string;
diff --git a/admin/new.docusaurus.io/functions/codesandbox.ts b/admin/new.docusaurus.io/functions/codesandbox.ts
index 365ac26911..650c45727e 100644
--- a/admin/new.docusaurus.io/functions/codesandbox.ts
+++ b/admin/new.docusaurus.io/functions/codesandbox.ts
@@ -5,9 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {Handler} from '@netlify/functions';
-
 import {createPlaygroundResponse} from '../functionUtils/playgroundUtils';
+import type {Handler} from '@netlify/functions';
 
 export const handler: Handler = async function handler() {
   return createPlaygroundResponse('codesandbox');
diff --git a/admin/new.docusaurus.io/functions/index.ts b/admin/new.docusaurus.io/functions/index.ts
index a137fecb41..14a9df8c06 100644
--- a/admin/new.docusaurus.io/functions/index.ts
+++ b/admin/new.docusaurus.io/functions/index.ts
@@ -5,13 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {Handler} from '@netlify/functions';
-
 import {
   readPlaygroundName,
   createPlaygroundResponse,
   createPlaygroundDocumentationResponse,
 } from '../functionUtils/playgroundUtils';
+import type {Handler} from '@netlify/functions';
 
 export const handler: Handler = async (event) => {
   const playgroundName = readPlaygroundName(event);
diff --git a/admin/new.docusaurus.io/functions/stackblitz.ts b/admin/new.docusaurus.io/functions/stackblitz.ts
index e7762f20dc..bc6a84d31f 100644
--- a/admin/new.docusaurus.io/functions/stackblitz.ts
+++ b/admin/new.docusaurus.io/functions/stackblitz.ts
@@ -5,9 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {Handler} from '@netlify/functions';
-
 import {createPlaygroundResponse} from '../functionUtils/playgroundUtils';
+import type {Handler} from '@netlify/functions';
 
 export const handler: Handler = async function handler() {
   return createPlaygroundResponse('stackblitz');
diff --git a/admin/publish.md b/admin/publish.md
index a46ed99e6f..def8c7fc6e 100644
--- a/admin/publish.md
+++ b/admin/publish.md
@@ -70,11 +70,22 @@ This local test step is optional because it will be run by the CI on your releas
 
 ### 3. Update the v2 changelog
 
-The changelog uses GitHub labels to classify each pull request. Use the GitHub interface to assign each newly merged pull request to a GitHub label starting with `tag:`, otherwise the PR won't appear in the changelog.
+The changelog uses GitHub labels to classify each pull request. Use the GitHub interface to assign each newly merged pull request to a GitHub label starting with `pr:`, otherwise the PR won't appear in the changelog.
 
-[Check tags of all recently merged Pull-Requests](https://github.com/facebook/docusaurus/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Amerged+)
+Not all labels will appear in the changelog—some are designed not to. However, you should **always** label each PR, so that before release, we can do a quick scan and confirm no PR is accidentally left out. Here's a search query (pity that GH doesn't have wildcard queries yet):
 
-The `tag:` label prefix is for PRs only. Other labels are not used by the changelog tool, and it's not necessary to assign such labels to issues, only PRs.
+```
+is:pr is:merged sort:updated-desc -label:"pr: breaking change","pr: new feature","pr: bug fix","pr: performance","pr: polish","pr: documentation","pr: maintenance","pr: internal","pr: dependencies","pr: showcase"
+```
+
+[Check tags of all recently merged Pull-Requests](https://github.com/facebook/docusaurus/pulls?q=is%3Apr+is%3Amerged+sort%3Aupdated-desc+-label%3A%22pr%3A+breaking+change%22%2C%22pr%3A+new+feature%22%2C%22pr%3A+bug+fix%22%2C%22pr%3A+performance%22%2C%22pr%3A+polish%22%2C%22pr%3A+documentation%22%2C%22pr%3A+maintenance%22%2C%22pr%3A+internal%22%2C%22pr%3A+dependencies%22%2C%22pr%3A+showcase%22)
+
+Some general principles about the labeling process:
+
+- "Will an average user be interested in this entry?" Items like "improve test coverage", "upgrade dependencies" can probably be left out (we have `pr: internal` and `pr: dependencies` for this). However, "pin GitHub actions to an SHA", "add visual testing infrastructure", etc., albeit internal, could be interesting to the user, and can be included in the "maintenance" section.
+- "Will this change have tangible impact on the user?" A common case is when a PR implements a feature X, then there are immediately follow-up PRs that fix bugs or polish feature X. These follow-up PRs don't necessarily have to be in the changelog, and even if they alter the API, they are not breaking changes, because to an average user bumping their version, they will only see the new feature X as a whole. Make the entries atomic.
+
+The `pr:` label prefix is for PRs only. Other labels are not used by the changelog tool, and it's not necessary to assign such labels to issues, only PRs.
 
 Generate a GitHub auth token by going to https://github.com/settings/tokens (the only permission needed is `public_repo`). Save the token somewhere for future reference.
 
diff --git a/admin/scripts/image-resize.mjs b/admin/scripts/image-resize.mjs
index cea298ef80..ce3d11f976 100644
--- a/admin/scripts/image-resize.mjs
+++ b/admin/scripts/image-resize.mjs
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import sharp from 'sharp';
 import fs from 'fs-extra';
 import path from 'path';
-import imageSize from 'image-size';
 import {fileURLToPath} from 'url';
 import logger from '@docusaurus/logger';
+import sharp from 'sharp';
+import imageSize from 'image-size';
 
 const allImages = (
   await fs.readdir(new URL('../../website/src/data/showcase', import.meta.url))
diff --git a/jest/snapshotPathNormalizer.ts b/jest/snapshotPathNormalizer.ts
index 957aef8c40..a0e9a3f4d3 100644
--- a/jest/snapshotPathNormalizer.ts
+++ b/jest/snapshotPathNormalizer.ts
@@ -8,13 +8,13 @@
 // Forked from https://github.com/tribou/jest-serializer-path/blob/master/lib/index.js
 // Added some project-specific handlers
 
-import _ from 'lodash';
-import {escapePath} from '@docusaurus/utils';
-import stripAnsi from 'strip-ansi';
-import {version} from '@docusaurus/core/package.json';
 import os from 'os';
 import path from 'path';
 import fs from 'fs';
+import _ from 'lodash';
+import {escapePath} from '@docusaurus/utils';
+import {version} from '@docusaurus/core/package.json';
+import stripAnsi from 'strip-ansi';
 
 export function print(
   val: unknown,
diff --git a/lerna.json b/lerna.json
index 16fca78e9d..264ec32ae6 100644
--- a/lerna.json
+++ b/lerna.json
@@ -5,13 +5,13 @@
   "changelog": {
     "repo": "facebook/docusaurus",
     "labels": {
-      "tag: new feature": ":rocket: New Feature",
-      "tag: breaking change": ":boom: Breaking Change",
-      "tag: bug fix": ":bug: Bug Fix",
-      "tag: polish": ":nail_care: Polish",
-      "tag: documentation": ":memo: Documentation",
-      "tag: maintenance": ":wrench: Maintenance",
-      "tag: performance": ":running_woman: Performance"
+      "pr: breaking change": ":boom: Breaking Change",
+      "pr: new feature": ":rocket: New Feature",
+      "pr: bug fix": ":bug: Bug Fix",
+      "pr: performance": ":running_woman: Performance",
+      "pr: polish": ":nail_care: Polish",
+      "pr: documentation": ":memo: Documentation",
+      "pr: maintenance": ":wrench: Maintenance"
     },
     "cacheDir": ".changelog"
   }
diff --git a/package.json b/package.json
index cce61752d7..16f2f3be15 100644
--- a/package.json
+++ b/package.json
@@ -63,8 +63,8 @@
   },
   "devDependencies": {
     "@crowdin/cli": "^3.7.8",
-    "@swc/core": "^1.2.178",
-    "@swc/jest": "^0.2.20",
+    "@swc/core": "^1.2.181",
+    "@swc/jest": "^0.2.21",
     "@testing-library/react-hooks": "^8.0.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.5.0",
@@ -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.22.0",
-    "@typescript-eslint/parser": "^5.22.0",
+    "@typescript-eslint/eslint-plugin": "^5.23.0",
+    "@typescript-eslint/parser": "^5.23.0",
     "concurrently": "^7.1.0",
     "cross-env": "^7.0.3",
     "cspell": "^5.20.0",
@@ -91,7 +91,7 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-regexp": "^1.7.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "image-size": "^1.0.1",
     "jest": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
diff --git a/packages/create-docusaurus/bin/index.js b/packages/create-docusaurus/bin/index.js
index 7673e0025a..b4b6d47c5e 100755
--- a/packages/create-docusaurus/bin/index.js
+++ b/packages/create-docusaurus/bin/index.js
@@ -8,11 +8,11 @@
 
 // @ts-check
 
+import path from 'path';
+import {createRequire} from 'module';
 import logger from '@docusaurus/logger';
 import semver from 'semver';
-import path from 'path';
 import {program} from 'commander';
-import {createRequire} from 'module';
 
 const packageJson = createRequire(import.meta.url)('../package.json');
 const requiredVersion = packageJson.engines.node;
diff --git a/packages/create-docusaurus/src/index.ts b/packages/create-docusaurus/src/index.ts
index e913de7ef3..cc9c9408ec 100755
--- a/packages/create-docusaurus/src/index.ts
+++ b/packages/create-docusaurus/src/index.ts
@@ -5,39 +5,41 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import fs from 'fs-extra';
-import prompts, {type Choice} from 'prompts';
-import path from 'path';
-import shell from 'shelljs';
-import _ from 'lodash';
-import supportsColor from 'supports-color';
 import {fileURLToPath} from 'url';
+import path from 'path';
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import shell from 'shelljs';
+import prompts, {type Choice} from 'prompts';
+import supportsColor from 'supports-color';
 
-const RecommendedTemplate = 'classic';
-const TypeScriptTemplateSuffix = '-typescript';
+type CLIOptions = {
+  packageManager?: PackageManager;
+  skipInstall?: boolean;
+  typescript?: boolean;
+  gitStrategy?: GitStrategy;
+};
 
 // Only used in the rare, rare case of running globally installed create +
 // using --skip-install. We need a default name to show the tip text
-const DefaultPackageManager = 'npm';
+const defaultPackageManager = 'npm';
 
-const SupportedPackageManagers = {
+const lockfileNames = {
   npm: 'package-lock.json',
   yarn: 'yarn.lock',
   pnpm: 'pnpm-lock.yaml',
 };
 
-type SupportedPackageManager = keyof typeof SupportedPackageManagers;
+type PackageManager = keyof typeof lockfileNames;
 
-const PackageManagersList = Object.keys(
-  SupportedPackageManagers,
-) as SupportedPackageManager[];
+const packageManagers = Object.keys(lockfileNames) as PackageManager[];
 
-async function findPackageManagerFromLockFile(): Promise<
-  SupportedPackageManager | undefined
-> {
-  for (const packageManager of PackageManagersList) {
-    const lockFilePath = path.resolve(SupportedPackageManagers[packageManager]);
+async function findPackageManagerFromLockFile(
+  rootDir: string,
+): Promise<PackageManager | undefined> {
+  for (const packageManager of packageManagers) {
+    const lockFilePath = path.join(rootDir, lockfileNames[packageManager]);
     if (await fs.pathExists(lockFilePath)) {
       return packageManager;
     }
@@ -45,15 +47,13 @@ async function findPackageManagerFromLockFile(): Promise<
   return undefined;
 }
 
-function findPackageManagerFromUserAgent():
-  | SupportedPackageManager
-  | undefined {
-  return PackageManagersList.find((packageManager) =>
+function findPackageManagerFromUserAgent(): PackageManager | undefined {
+  return packageManagers.find((packageManager) =>
     process.env.npm_config_user_agent?.startsWith(packageManager),
   );
 }
 
-async function askForPackageManagerChoice(): Promise<SupportedPackageManager> {
+async function askForPackageManagerChoice(): Promise<PackageManager> {
   const hasYarn = shell.exec('yarn --version', {silent: true}).code === 0;
   const hasPnpm = shell.exec('pnpm --version', {silent: true}).code === 0;
 
@@ -65,67 +65,121 @@ async function askForPackageManagerChoice(): Promise<SupportedPackageManager> {
     .map((p) => ({title: p, value: p}));
 
   return (
-    await prompts({
-      type: 'select',
-      name: 'packageManager',
-      message: 'Select a package manager...',
-      choices,
-    })
+    await prompts(
+      {
+        type: 'select',
+        name: 'packageManager',
+        message: 'Select a package manager...',
+        choices,
+      },
+      {
+        onCancel() {
+          logger.info`Falling back to name=${defaultPackageManager}`;
+        },
+      },
+    )
   ).packageManager;
 }
 
 async function getPackageManager(
-  packageManagerChoice: SupportedPackageManager | undefined,
-  skipInstall: boolean = false,
-): Promise<SupportedPackageManager> {
-  if (
-    packageManagerChoice &&
-    !PackageManagersList.includes(packageManagerChoice)
-  ) {
+  dest: string,
+  {packageManager, skipInstall}: CLIOptions,
+): Promise<PackageManager> {
+  if (packageManager && !packageManagers.includes(packageManager)) {
     throw new Error(
-      `Invalid package manager choice ${packageManagerChoice}. Must be one of ${PackageManagersList.join(
+      `Invalid package manager choice ${packageManager}. Must be one of ${packageManagers.join(
         ', ',
       )}`,
     );
   }
 
   return (
-    packageManagerChoice ??
-    (await findPackageManagerFromLockFile()) ??
+    // If dest already contains a lockfile (e.g. if using a local template), we
+    // always use that instead
+    (await findPackageManagerFromLockFile(dest)) ??
+    packageManager ??
+    (await findPackageManagerFromLockFile('.')) ??
     findPackageManagerFromUserAgent() ??
     // This only happens if the user has a global installation in PATH
-    (skipInstall ? DefaultPackageManager : askForPackageManagerChoice())
+    (skipInstall ? defaultPackageManager : askForPackageManagerChoice()) ??
+    defaultPackageManager
   );
 }
 
-function isValidGitRepoUrl(gitRepoUrl: string) {
-  return ['https://', 'git@'].some((item) => gitRepoUrl.startsWith(item));
-}
+const recommendedTemplate = 'classic';
+const typeScriptTemplateSuffix = '-typescript';
+const templatesDir = fileURLToPath(new URL('../templates', import.meta.url));
 
-async function updatePkg(pkgPath: string, obj: {[key: string]: unknown}) {
-  const pkg = await fs.readJSON(pkgPath);
-  const newPkg = Object.assign(pkg, obj);
+type Template = {
+  name: string;
+  path: string;
+  tsVariantPath: string | undefined;
+};
 
-  await fs.outputFile(pkgPath, `${JSON.stringify(newPkg, null, 2)}\n`);
-}
-
-async function readTemplates(templatesDir: string) {
-  const templates = (await fs.readdir(templatesDir)).filter(
-    (d) =>
-      !d.startsWith('.') &&
-      !d.startsWith('README') &&
-      !d.endsWith(TypeScriptTemplateSuffix) &&
-      d !== 'shared',
+async function readTemplates(): Promise<Template[]> {
+  const dirContents = await fs.readdir(templatesDir);
+  const templates = await Promise.all(
+    dirContents
+      .filter(
+        (d) =>
+          !d.startsWith('.') &&
+          !d.startsWith('README') &&
+          !d.endsWith(typeScriptTemplateSuffix) &&
+          d !== 'shared',
+      )
+      .map(async (name) => {
+        const tsVariantPath = path.join(
+          templatesDir,
+          `${name}${typeScriptTemplateSuffix}`,
+        );
+        return {
+          name,
+          path: path.join(templatesDir, name),
+          tsVariantPath: (await fs.pathExists(tsVariantPath))
+            ? tsVariantPath
+            : undefined,
+        };
+      }),
   );
 
   // Classic should be first in list!
-  return _.sortBy(templates, (t) => t !== RecommendedTemplate);
+  return _.sortBy(templates, (t) => t.name !== recommendedTemplate);
 }
 
-function createTemplateChoices(templates: string[]) {
-  function makeNameAndValueChoice(value: string): Choice {
+async function copyTemplate(
+  template: Template,
+  dest: string,
+  typescript: boolean,
+): Promise<void> {
+  await fs.copy(path.join(templatesDir, 'shared'), dest);
+
+  // TypeScript variants will copy duplicate resources like CSS & config from
+  // base template
+  if (typescript) {
+    await fs.copy(template.path, dest, {
+      filter: async (filePath) =>
+        (await fs.stat(filePath)).isDirectory() ||
+        path.extname(filePath) === '.css' ||
+        path.basename(filePath) === 'docusaurus.config.js',
+    });
+  }
+
+  await fs.copy(typescript ? template.tsVariantPath! : template.path, dest, {
+    // Symlinks don't exist in published npm packages anymore, so this is only
+    // to prevent errors during local testing
+    filter: async (filePath) => !(await fs.lstat(filePath)).isSymbolicLink(),
+  });
+}
+
+function createTemplateChoices(templates: Template[]): Choice[] {
+  function makeNameAndValueChoice(value: string | Template): Choice {
+    if (typeof value === 'string') {
+      return {title: value, value};
+    }
     const title =
-      value === RecommendedTemplate ? `${value} (recommended)` : value;
+      value.name === recommendedTemplate
+        ? `${value.name} (recommended)`
+        : value.name;
     return {title, value};
   }
 
@@ -136,55 +190,33 @@ function createTemplateChoices(templates: string[]) {
   ];
 }
 
-function getTypeScriptBaseTemplate(template: string): string | undefined {
-  if (template.endsWith(TypeScriptTemplateSuffix)) {
-    return template.replace(TypeScriptTemplateSuffix, '');
-  }
-  return undefined;
-}
-
-async function copyTemplate(
-  templatesDir: string,
-  template: string,
-  dest: string,
-) {
-  await fs.copy(path.join(templatesDir, 'shared'), dest);
-
-  // TypeScript variants will copy duplicate resources like CSS & config from
-  // base template
-  const tsBaseTemplate = getTypeScriptBaseTemplate(template);
-  if (tsBaseTemplate) {
-    const tsBaseTemplatePath = path.resolve(templatesDir, tsBaseTemplate);
-    await fs.copy(tsBaseTemplatePath, dest, {
-      filter: async (filePath) =>
-        (await fs.stat(filePath)).isDirectory() ||
-        path.extname(filePath) === '.css' ||
-        path.basename(filePath) === 'docusaurus.config.js',
-    });
-  }
-
-  await fs.copy(path.resolve(templatesDir, template), dest, {
-    // Symlinks don't exist in published npm packages anymore, so this is only
-    // to prevent errors during local testing
-    filter: async (filePath) => !(await fs.lstat(filePath)).isSymbolicLink(),
-  });
+function isValidGitRepoUrl(gitRepoUrl: string): boolean {
+  return ['https://', 'git@'].some((item) => gitRepoUrl.startsWith(item));
 }
 
 const gitStrategies = ['deep', 'shallow', 'copy', 'custom'] as const;
+type GitStrategy = typeof gitStrategies[number];
 
-async function getGitCommand(gitStrategy: typeof gitStrategies[number]) {
+async function getGitCommand(gitStrategy: GitStrategy): Promise<string> {
   switch (gitStrategy) {
     case 'shallow':
     case 'copy':
       return 'git clone --recursive --depth 1';
     case 'custom': {
-      const {command} = await prompts({
-        type: 'text',
-        name: 'command',
-        message:
-          'Write your own git clone command. The repository URL and destination directory will be supplied. E.g. "git clone --depth 10"',
-      });
-      return command;
+      const {command} = await prompts(
+        {
+          type: 'text',
+          name: 'command',
+          message:
+            'Write your own git clone command. The repository URL and destination directory will be supplied. E.g. "git clone --depth 10"',
+        },
+        {
+          onCancel() {
+            logger.info`Falling back to code=${'git clone'}`;
+          },
+        },
+      );
+      return command ?? 'git clone';
     }
     case 'deep':
     default:
@@ -192,178 +224,273 @@ async function getGitCommand(gitStrategy: typeof gitStrategies[number]) {
   }
 }
 
-export default async function init(
+async function getSiteName(
+  reqName: string | undefined,
   rootDir: string,
-  siteName?: string,
-  reqTemplate?: string,
-  cliOptions: Partial<{
-    packageManager: SupportedPackageManager;
-    skipInstall: boolean;
-    typescript: boolean;
-    gitStrategy: typeof gitStrategies[number];
-  }> = {},
-): Promise<void> {
-  const templatesDir = fileURLToPath(new URL('../templates', import.meta.url));
-  const templates = await readTemplates(templatesDir);
-  const hasTS = (templateName: string) =>
-    fs.pathExists(
-      path.join(templatesDir, `${templateName}${TypeScriptTemplateSuffix}`),
-    );
-  let name = siteName;
-
-  // Prompt if siteName is not passed from CLI.
-  if (!name) {
-    const prompt = await prompts({
+): Promise<string> {
+  async function validateSiteName(siteName: string) {
+    if (!siteName) {
+      return 'A website name is required.';
+    }
+    const dest = path.resolve(rootDir, siteName);
+    if (await fs.pathExists(dest)) {
+      return logger.interpolate`Directory already exists at path=${dest}!`;
+    }
+    return true;
+  }
+  if (reqName) {
+    const res = validateSiteName(reqName);
+    if (typeof res === 'string') {
+      throw new Error(res);
+    }
+    return reqName;
+  }
+  const {siteName} = await prompts(
+    {
       type: 'text',
-      name: 'name',
+      name: 'siteName',
       message: 'What should we name this site?',
       initial: 'website',
-    });
-    name = prompt.name;
-  }
-
-  if (!name) {
-    logger.error('A website name is required.');
-    process.exit(1);
-  }
-
-  const dest = path.resolve(rootDir, name);
-  if (await fs.pathExists(dest)) {
-    logger.error`Directory already exists at path=${dest}!`;
-    process.exit(1);
-  }
-
-  let template = reqTemplate;
-  let useTS = cliOptions.typescript;
-  // Prompt if template is not provided from CLI.
-  if (!template) {
-    const templatePrompt = await prompts({
-      type: 'select',
-      name: 'template',
-      message: 'Select a template below...',
-      choices: createTemplateChoices(templates),
-    });
-    template = templatePrompt.template;
-    if (template && !useTS && (await hasTS(template))) {
-      const tsPrompt = await prompts({
-        type: 'confirm',
-        name: 'useTS',
-        message:
-          'This template is available in TypeScript. Do you want to use the TS variant?',
-        initial: false,
-      });
-      useTS = tsPrompt.useTS;
-    }
-  }
-
-  let gitStrategy = cliOptions.gitStrategy ?? 'deep';
-
-  // If user choose Git repository, we'll prompt for the url.
-  if (template === 'Git repository') {
-    const repoPrompt = await prompts({
-      type: 'text',
-      name: 'gitRepoUrl',
-      validate: (url?: string) => {
-        if (url && isValidGitRepoUrl(url)) {
-          return true;
-        }
-        return logger.red('Invalid repository URL');
+      validate: validateSiteName,
+    },
+    {
+      onCancel() {
+        logger.error('A website name is required.');
+        process.exit(1);
       },
-      message: logger.interpolate`Enter a repository URL from GitHub, Bitbucket, GitLab, or any other public repo.
-(e.g: url=${'https://github.com/ownerName/repoName.git'})`,
-    });
-    ({gitStrategy} = await prompts({
-      type: 'select',
-      name: 'gitStrategy',
-      message: 'How should we clone this repo?',
-      choices: [
-        {title: 'Deep clone: preserve full history', value: 'deep'},
-        {title: 'Shallow clone: clone with --depth=1', value: 'shallow'},
-        {
-          title: 'Copy: do a shallow clone, but do not create a git repo',
-          value: 'copy',
-        },
-        {title: 'Custom: enter your custom git clone command', value: 'custom'},
-      ],
-    }));
-    template = repoPrompt.gitRepoUrl;
-  } else if (template === 'Local template') {
-    const dirPrompt = await prompts({
-      type: 'text',
-      name: 'templateDir',
-      validate: async (dir?: string) => {
-        if (dir) {
-          const fullDir = path.resolve(dir);
-          if (await fs.pathExists(fullDir)) {
+    },
+  );
+  return siteName;
+}
+
+type Source =
+  | {
+      type: 'template';
+      template: Template;
+      typescript: boolean;
+    }
+  | {
+      type: 'git';
+      url: string;
+      strategy: GitStrategy;
+    }
+  | {
+      type: 'local';
+      path: string;
+    };
+
+async function getSource(
+  reqTemplate: string | undefined,
+  templates: Template[],
+  cliOptions: CLIOptions,
+): Promise<Source> {
+  if (reqTemplate) {
+    if (isValidGitRepoUrl(reqTemplate)) {
+      if (
+        cliOptions.gitStrategy &&
+        !gitStrategies.includes(cliOptions.gitStrategy)
+      ) {
+        logger.error`Invalid git strategy: name=${
+          cliOptions.gitStrategy
+        }. Value must be one of ${gitStrategies.join(', ')}.`;
+        process.exit(1);
+      }
+      return {
+        type: 'git',
+        url: reqTemplate,
+        strategy: cliOptions.gitStrategy ?? 'deep',
+      };
+    } else if (await fs.pathExists(path.resolve(reqTemplate))) {
+      return {
+        type: 'local',
+        path: path.resolve(reqTemplate),
+      };
+    }
+    const template = templates.find((t) => t.name === reqTemplate);
+    if (!template) {
+      logger.error('Invalid template.');
+      process.exit(1);
+    }
+    if (cliOptions.typescript && !template.tsVariantPath) {
+      logger.error`Template name=${reqTemplate} doesn't provide the TypeScript variant.`;
+      process.exit(1);
+    }
+    return {
+      type: 'template',
+      template,
+      typescript: cliOptions.typescript ?? false,
+    };
+  }
+  const template = cliOptions.gitStrategy
+    ? 'Git repository'
+    : (
+        await prompts(
+          {
+            type: 'select',
+            name: 'template',
+            message: 'Select a template below...',
+            choices: createTemplateChoices(templates),
+          },
+          {
+            onCancel() {
+              logger.error('A choice is required.');
+              process.exit(1);
+            },
+          },
+        )
+      ).template;
+  if (template === 'Git repository') {
+    const {gitRepoUrl} = await prompts(
+      {
+        type: 'text',
+        name: 'gitRepoUrl',
+        validate: (url?: string) => {
+          if (url && isValidGitRepoUrl(url)) {
             return true;
           }
-          return logger.red(
-            logger.interpolate`path=${fullDir} does not exist.`,
-          );
-        }
-        return logger.red('Please enter a valid path.');
+          return logger.red('Invalid repository URL');
+        },
+        message: logger.interpolate`Enter a repository URL from GitHub, Bitbucket, GitLab, or any other public repo.
+(e.g: url=${'https://github.com/ownerName/repoName.git'})`,
       },
+      {
+        onCancel() {
+          logger.error('A git repo URL is required.');
+          process.exit(1);
+        },
+      },
+    );
+    let strategy = cliOptions.gitStrategy;
+    if (!strategy) {
+      ({strategy} = await prompts(
+        {
+          type: 'select',
+          name: 'strategy',
+          message: 'How should we clone this repo?',
+          choices: [
+            {title: 'Deep clone: preserve full history', value: 'deep'},
+            {title: 'Shallow clone: clone with --depth=1', value: 'shallow'},
+            {
+              title: 'Copy: do a shallow clone, but do not create a git repo',
+              value: 'copy',
+            },
+            {
+              title: 'Custom: enter your custom git clone command',
+              value: 'custom',
+            },
+          ],
+        },
+        {
+          onCancel() {
+            logger.info`Falling back to name=${'deep'}`;
+          },
+        },
+      ));
+    }
+    return {
+      type: 'git',
+      url: gitRepoUrl,
+      strategy: strategy ?? 'deep',
+    };
+  } else if (template === 'Local template') {
+    const {templateDir} = await prompts(
+      {
+        type: 'text',
+        name: 'templateDir',
+        validate: async (dir?: string) => {
+          if (dir) {
+            const fullDir = path.resolve(dir);
+            if (await fs.pathExists(fullDir)) {
+              return true;
+            }
+            return logger.red(
+              logger.interpolate`path=${fullDir} does not exist.`,
+            );
+          }
+          return logger.red('Please enter a valid path.');
+        },
+        message:
+          'Enter a local folder path, relative to the current working directory.',
+      },
+      {
+        onCancel() {
+          logger.error('A file path is required.');
+          process.exit(1);
+        },
+      },
+    );
+    return {
+      type: 'local',
+      path: templateDir,
+    };
+  }
+  let useTS = cliOptions.typescript;
+  if (!useTS && template.tsVariantPath) {
+    ({useTS} = await prompts({
+      type: 'confirm',
+      name: 'useTS',
       message:
-        'Enter a local folder path, relative to the current working directory.',
-    });
-    template = dirPrompt.templateDir;
+        'This template is available in TypeScript. Do you want to use the TS variant?',
+      initial: false,
+    }));
   }
+  return {
+    type: 'template',
+    template,
+    typescript: useTS ?? false,
+  };
+}
 
-  if (!template) {
-    logger.error('Template should not be empty');
-    process.exit(1);
-  }
+async function updatePkg(pkgPath: string, obj: {[key: string]: unknown}) {
+  const pkg = await fs.readJSON(pkgPath);
+  const newPkg = Object.assign(pkg, obj);
+
+  await fs.outputFile(pkgPath, `${JSON.stringify(newPkg, null, 2)}\n`);
+}
+
+export default async function init(
+  rootDir: string,
+  reqName?: string,
+  reqTemplate?: string,
+  cliOptions: CLIOptions = {},
+): Promise<void> {
+  const templates = await readTemplates();
+  const siteName = await getSiteName(reqName, rootDir);
+  const dest = path.resolve(rootDir, siteName);
+  const source = await getSource(reqTemplate, templates, cliOptions);
 
   logger.info('Creating new Docusaurus project...');
 
-  if (isValidGitRepoUrl(template)) {
-    logger.info`Cloning Git template url=${template}...`;
-    if (!gitStrategies.includes(gitStrategy)) {
-      logger.error`Invalid git strategy: name=${gitStrategy}. Value must be one of ${gitStrategies.join(
-        ', ',
-      )}.`;
+  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) {
+      logger.error`Cloning Git template failed!`;
       process.exit(1);
     }
-    const command = await getGitCommand(gitStrategy);
-    if (shell.exec(`${command} ${template} ${dest}`).code !== 0) {
-      logger.error`Cloning Git template name=${template} failed!`;
-      process.exit(1);
-    }
-    if (gitStrategy === 'copy') {
+    if (source.strategy === 'copy') {
       await fs.remove(path.join(dest, '.git'));
     }
-  } else if (templates.includes(template)) {
-    // Docusaurus templates.
-    if (useTS) {
-      if (!(await hasTS(template))) {
-        logger.error`Template name=${template} doesn't provide the TypeScript variant.`;
-        process.exit(1);
-      }
-      template = `${template}${TypeScriptTemplateSuffix}`;
-    }
+  } else if (source.type === 'template') {
     try {
-      await copyTemplate(templatesDir, template, dest);
+      await copyTemplate(source.template, dest, source.typescript);
     } catch (err) {
-      logger.error`Copying Docusaurus template name=${template} failed!`;
-      throw err;
-    }
-  } else if (await fs.pathExists(path.resolve(template))) {
-    const templateDir = path.resolve(template);
-    try {
-      await fs.copy(templateDir, dest);
-    } catch (err) {
-      logger.error`Copying local template path=${templateDir} failed!`;
+      logger.error`Copying Docusaurus template name=${source.template.name} failed!`;
       throw err;
     }
   } else {
-    logger.error('Invalid template.');
-    process.exit(1);
+    try {
+      await fs.copy(source.path, dest);
+    } catch (err) {
+      logger.error`Copying local template path=${source.path} failed!`;
+      throw err;
+    }
   }
 
   // Update package.json info.
   try {
     await updatePkg(path.join(dest, 'package.json'), {
-      name: _.kebabCase(name),
+      name: _.kebabCase(siteName),
       version: '0.0.0',
       private: true,
     });
@@ -385,10 +512,7 @@ export default async function init(
 
   // Display the most elegant way to cd.
   const cdpath = path.relative('.', dest);
-  const pkgManager = await getPackageManager(
-    cliOptions.packageManager,
-    cliOptions.skipInstall,
-  );
+  const pkgManager = await getPackageManager(dest, cliOptions);
   if (!cliOptions.skipInstall) {
     shell.cd(dest);
     logger.info`Installing dependencies with name=${pkgManager}...`;
@@ -398,8 +522,8 @@ export default async function init(
         {
           env: {
             ...process.env,
-            // Force coloring the output, since the command is invoked,
-            // by shelljs which is not the interactive shell
+            // Force coloring the output, since the command is invoked by
+            // shelljs, which is not an interactive shell
             ...(supportsColor.stdout ? {FORCE_COLOR: '1'} : {}),
           },
         },
diff --git a/packages/create-docusaurus/templates/classic-typescript/src/pages/index.tsx b/packages/create-docusaurus/templates/classic-typescript/src/pages/index.tsx
index 3408a41e7f..305139fba0 100644
--- a/packages/create-docusaurus/templates/classic-typescript/src/pages/index.tsx
+++ b/packages/create-docusaurus/templates/classic-typescript/src/pages/index.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
 import clsx from 'clsx';
-import Layout from '@theme/Layout';
 import Link from '@docusaurus/Link';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import styles from './index.module.css';
+import Layout from '@theme/Layout';
 import HomepageFeatures from '@site/src/components/HomepageFeatures';
 
+import styles from './index.module.css';
+
 function HomepageHeader() {
   const {siteConfig} = useDocusaurusContext();
   return (
diff --git a/packages/create-docusaurus/templates/classic/src/pages/index.js b/packages/create-docusaurus/templates/classic/src/pages/index.js
index a4fc2d3f03..affcd9099c 100644
--- a/packages/create-docusaurus/templates/classic/src/pages/index.js
+++ b/packages/create-docusaurus/templates/classic/src/pages/index.js
@@ -1,11 +1,12 @@
 import React from 'react';
 import clsx from 'clsx';
-import Layout from '@theme/Layout';
 import Link from '@docusaurus/Link';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import styles from './index.module.css';
+import Layout from '@theme/Layout';
 import HomepageFeatures from '@site/src/components/HomepageFeatures';
 
+import styles from './index.module.css';
+
 function HomepageHeader() {
   const {siteConfig} = useDocusaurusContext();
   return (
diff --git a/packages/docusaurus-mdx-loader/package.json b/packages/docusaurus-mdx-loader/package.json
index 6be990a287..c05708cd9f 100644
--- a/packages/docusaurus-mdx-loader/package.json
+++ b/packages/docusaurus-mdx-loader/package.json
@@ -33,7 +33,7 @@
     "tslib": "^2.4.0",
     "unist-util-visit": "^2.0.3",
     "url-loader": "^4.1.1",
-    "webpack": "^5.72.0"
+    "webpack": "^5.72.1"
   },
   "devDependencies": {
     "@docusaurus/types": "2.0.0-beta.20",
diff --git a/packages/docusaurus-mdx-loader/src/loader.ts b/packages/docusaurus-mdx-loader/src/loader.ts
index af18cd3982..06daefccf3 100644
--- a/packages/docusaurus-mdx-loader/src/loader.ts
+++ b/packages/docusaurus-mdx-loader/src/loader.ts
@@ -6,21 +6,23 @@
  */
 
 import fs from 'fs-extra';
-import {createCompiler} from '@mdx-js/mdx';
 import logger from '@docusaurus/logger';
-import emoji from 'remark-emoji';
 import {
   parseFrontMatter,
   parseMarkdownContentTitle,
   escapePath,
   getFileLoaderUtils,
 } from '@docusaurus/utils';
+import {createCompiler} from '@mdx-js/mdx';
+import emoji from 'remark-emoji';
 import stringifyObject from 'stringify-object';
+
 import headings from './remark/headings';
 import toc from './remark/toc';
 import unwrapMdxCodeBlocks from './remark/unwrapMdxCodeBlocks';
 import transformImage from './remark/transformImage';
 import transformLinks from './remark/transformLinks';
+
 import type {LoaderContext} from 'webpack';
 import type {Processor, Plugin} from 'unified';
 
@@ -31,7 +33,7 @@ const {
 const pragma = `
 /* @jsxRuntime classic */
 /* @jsx mdx */
-/* @jsxFrag mdx.Fragment */
+/* @jsxFrag React.Fragment */
 `;
 
 const DEFAULT_OPTIONS: MDXOptions = {
diff --git a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
index b0a888c079..1850a2b9c7 100644
--- a/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/toc/index.ts
@@ -6,13 +6,13 @@
  */
 
 import {parse, type ParserOptions} from '@babel/parser';
-import type {Identifier} from '@babel/types';
 import traverse from '@babel/traverse';
 import stringifyObject from 'stringify-object';
 import toString from 'mdast-util-to-string';
 import visit from 'unist-util-visit';
 import {toValue} from '../utils';
 
+import type {Identifier} from '@babel/types';
 import type {TOCItem} from '../..';
 import type {Node, Parent} from 'unist';
 import type {Heading, Literal} from 'mdast';
diff --git a/packages/docusaurus-mdx-loader/src/remark/transformImage/index.ts b/packages/docusaurus-mdx-loader/src/remark/transformImage/index.ts
index 691c427039..d9608d13ed 100644
--- a/packages/docusaurus-mdx-loader/src/remark/transformImage/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/transformImage/index.ts
@@ -5,6 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
+import url from 'url';
+import fs from 'fs-extra';
+import {promisify} from 'util';
+import logger from '@docusaurus/logger';
 import {
   toMessageRelativeFilePath,
   posixPath,
@@ -13,15 +18,10 @@ import {
   findAsyncSequential,
 } from '@docusaurus/utils';
 import visit from 'unist-util-visit';
-import path from 'path';
-import url from 'url';
-import fs from 'fs-extra';
 import escapeHtml from 'escape-html';
 import sizeOf from 'image-size';
-import {promisify} from 'util';
 import type {Transformer} from 'unified';
 import type {Image, Literal} from 'mdast';
-import logger from '@docusaurus/logger';
 
 const {
   loaders: {inlineMarkdownImageFileLoader},
diff --git a/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts b/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts
index 24a04805a8..22d52587e1 100644
--- a/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts
+++ b/packages/docusaurus-mdx-loader/src/remark/transformLinks/index.ts
@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
+import url from 'url';
+import fs from 'fs-extra';
 import {
   toMessageRelativeFilePath,
   posixPath,
@@ -13,9 +16,6 @@ import {
   findAsyncSequential,
 } from '@docusaurus/utils';
 import visit from 'unist-util-visit';
-import path from 'path';
-import url from 'url';
-import fs from 'fs-extra';
 import escapeHtml from 'escape-html';
 import {stringifyContent} from '../utils';
 import type {Transformer} from 'unified';
diff --git a/packages/docusaurus-migrate/bin/index.mjs b/packages/docusaurus-migrate/bin/index.mjs
index baf72762ae..769c5e9e3c 100755
--- a/packages/docusaurus-migrate/bin/index.mjs
+++ b/packages/docusaurus-migrate/bin/index.mjs
@@ -8,11 +8,11 @@
 
 // @ts-check
 
+import path from 'path';
+import {createRequire} from 'module';
 import logger from '@docusaurus/logger';
 import semver from 'semver';
 import cli from 'commander';
-import path from 'path';
-import {createRequire} from 'module';
 
 const moduleRequire = createRequire(import.meta.url);
 const requiredVersion = moduleRequire('../package.json').engines.node;
diff --git a/packages/docusaurus-migrate/src/__tests__/index.test.ts b/packages/docusaurus-migrate/src/__tests__/index.test.ts
index f4516276d2..8eea0cd158 100644
--- a/packages/docusaurus-migrate/src/__tests__/index.test.ts
+++ b/packages/docusaurus-migrate/src/__tests__/index.test.ts
@@ -6,10 +6,10 @@
  */
 
 import {jest} from '@jest/globals';
-import {migrateDocusaurusProject} from '../index';
 import path from 'path';
 import fs from 'fs-extra';
 import {posixPath} from '@docusaurus/utils';
+import {migrateDocusaurusProject} from '../index';
 
 async function testMigration(siteDir: string, newDir: string) {
   const writeMock = jest.spyOn(fs, 'outputFile').mockImplementation(() => {});
diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts
index e1e0bcf4d6..81f31e6b87 100644
--- a/packages/docusaurus-migrate/src/index.ts
+++ b/packages/docusaurus-migrate/src/index.ts
@@ -5,22 +5,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
 import fs from 'fs-extra';
-import importFresh from 'import-fresh';
 import logger from '@docusaurus/logger';
 import {Globby} from '@docusaurus/utils';
+import importFresh from 'import-fresh';
 import Color from 'color';
 
+import extractMetadata, {shouldQuotifyFrontMatter} from './frontMatter';
+import migratePage from './transform';
+import sanitizeMD from './sanitizeMD';
+
 import type {
   SidebarEntry,
   SidebarEntries,
   VersionOneConfig,
   VersionTwoConfig,
 } from './types';
-import extractMetadata, {shouldQuotifyFrontMatter} from './frontMatter';
-import migratePage from './transform';
-import sanitizeMD from './sanitizeMD';
-import path from 'path';
 
 const DOCUSAURUS_VERSION = (importFresh('../package.json') as {version: string})
   .version;
diff --git a/packages/docusaurus-module-type-aliases/src/index.d.ts b/packages/docusaurus-module-type-aliases/src/index.d.ts
index f1e4a003e0..a000e03f2c 100644
--- a/packages/docusaurus-module-type-aliases/src/index.d.ts
+++ b/packages/docusaurus-module-type-aliases/src/index.d.ts
@@ -136,8 +136,8 @@ declare module '@docusaurus/ErrorBoundary' {
 }
 
 declare module '@docusaurus/Head' {
-  import type {HelmetProps} from 'react-helmet-async';
   import type {ReactNode} from 'react';
+  import type {HelmetProps} from 'react-helmet-async';
 
   export type Props = HelmetProps & {children: ReactNode};
 
diff --git a/packages/docusaurus-plugin-client-redirects/src/__tests__/collectRedirects.test.ts b/packages/docusaurus-plugin-client-redirects/src/__tests__/collectRedirects.test.ts
index 266b36911e..fc82c12a37 100644
--- a/packages/docusaurus-plugin-client-redirects/src/__tests__/collectRedirects.test.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/__tests__/collectRedirects.test.ts
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {PluginContext} from '../types';
-import collectRedirects from '../collectRedirects';
-import {validateOptions} from '../options';
 import {removeTrailingSlash} from '@docusaurus/utils';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import collectRedirects from '../collectRedirects';
+import {validateOptions} from '../options';
 import type {Options} from '../options';
+import type {PluginContext} from '../types';
 
 function createTestPluginContext(
   options?: Options,
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 3243076acb..1d526c351b 100644
--- a/packages/docusaurus-plugin-client-redirects/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/__tests__/options.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import type {Options} from '../options';
 
 function testValidate(options: Options) {
diff --git a/packages/docusaurus-plugin-client-redirects/src/collectRedirects.ts b/packages/docusaurus-plugin-client-redirects/src/collectRedirects.ts
index 8a62cae4f4..fa4718eca3 100644
--- a/packages/docusaurus-plugin-client-redirects/src/collectRedirects.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/collectRedirects.ts
@@ -6,19 +6,18 @@
  */
 
 import _ from 'lodash';
-import type {PluginOptions, RedirectOption} from './options';
-import type {PluginContext, RedirectMetadata} from './types';
+import logger from '@docusaurus/logger';
+import {
+  applyTrailingSlash,
+  type ApplyTrailingSlashParams,
+} from '@docusaurus/utils-common';
 import {
   createFromExtensionsRedirects,
   createToExtensionsRedirects,
 } from './extensionRedirects';
 import {validateRedirect} from './redirectValidation';
-import {
-  applyTrailingSlash,
-  type ApplyTrailingSlashParams,
-} from '@docusaurus/utils-common';
-
-import logger from '@docusaurus/logger';
+import type {PluginOptions, RedirectOption} from './options';
+import type {PluginContext, RedirectMetadata} from './types';
 
 export default function collectRedirects(
   pluginContext: PluginContext,
diff --git a/packages/docusaurus-plugin-client-redirects/src/createRedirectPageContent.ts b/packages/docusaurus-plugin-client-redirects/src/createRedirectPageContent.ts
index b7bdd7f61c..b5d0a21141 100644
--- a/packages/docusaurus-plugin-client-redirects/src/createRedirectPageContent.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/createRedirectPageContent.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
 import * as eta from 'eta';
 import redirectPageTemplate from './templates/redirectPage.template.html';
-import _ from 'lodash';
 
 const getCompiledRedirectPageTemplate = _.memoize(() =>
   eta.compile(redirectPageTemplate.trim()),
diff --git a/packages/docusaurus-plugin-client-redirects/src/index.ts b/packages/docusaurus-plugin-client-redirects/src/index.ts
index 9bfac10d94..78d117c7ca 100644
--- a/packages/docusaurus-plugin-client-redirects/src/index.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/index.ts
@@ -5,16 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {LoadContext, Plugin} from '@docusaurus/types';
-import type {PluginContext, RedirectMetadata} from './types';
-import type {PluginOptions, Options} from './options';
-
+import {removePrefix, addLeadingSlash} from '@docusaurus/utils';
 import collectRedirects from './collectRedirects';
 import writeRedirectFiles, {
   toRedirectFilesMetadata,
   type RedirectFileMetadata,
 } from './writeRedirectFiles';
-import {removePrefix, addLeadingSlash} from '@docusaurus/utils';
+import type {LoadContext, Plugin} from '@docusaurus/types';
+import type {PluginContext, RedirectMetadata} from './types';
+import type {PluginOptions, Options} from './options';
 
 export default function pluginClientRedirectsPages(
   context: LoadContext,
diff --git a/packages/docusaurus-plugin-client-redirects/src/options.ts b/packages/docusaurus-plugin-client-redirects/src/options.ts
index 34891a1c9b..72f3da3010 100644
--- a/packages/docusaurus-plugin-client-redirects/src/options.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/options.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {OptionValidationContext} from '@docusaurus/types';
 import {Joi, PathnameSchema} from '@docusaurus/utils-validation';
+import type {OptionValidationContext} from '@docusaurus/types';
 
 export type RedirectOption = {
   to: string;
diff --git a/packages/docusaurus-plugin-client-redirects/src/redirectValidation.ts b/packages/docusaurus-plugin-client-redirects/src/redirectValidation.ts
index 5f0ce5b52b..334453274b 100644
--- a/packages/docusaurus-plugin-client-redirects/src/redirectValidation.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/redirectValidation.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {RedirectMetadata} from './types';
 import {Joi, PathnameSchema} from '@docusaurus/utils-validation';
+import type {RedirectMetadata} from './types';
 
 const RedirectSchema = Joi.object<RedirectMetadata>({
   from: PathnameSchema.required(),
diff --git a/packages/docusaurus-plugin-client-redirects/src/writeRedirectFiles.ts b/packages/docusaurus-plugin-client-redirects/src/writeRedirectFiles.ts
index 3924f60214..77a9316c82 100644
--- a/packages/docusaurus-plugin-client-redirects/src/writeRedirectFiles.ts
+++ b/packages/docusaurus-plugin-client-redirects/src/writeRedirectFiles.ts
@@ -8,11 +8,12 @@
 import fs from 'fs-extra';
 import path from 'path';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import {normalizeUrl} from '@docusaurus/utils';
+
+import createRedirectPageContent from './createRedirectPageContent';
 
 import type {PluginContext, RedirectMetadata} from './types';
-import createRedirectPageContent from './createRedirectPageContent';
-import {normalizeUrl} from '@docusaurus/utils';
-import logger from '@docusaurus/logger';
 
 export type WriteFilesPluginContext = Pick<PluginContext, 'baseUrl' | 'outDir'>;
 
diff --git a/packages/docusaurus-plugin-content-blog/package.json b/packages/docusaurus-plugin-content-blog/package.json
index 629dccc13c..aaf8a68635 100644
--- a/packages/docusaurus-plugin-content-blog/package.json
+++ b/packages/docusaurus-plugin-content-blog/package.json
@@ -33,7 +33,7 @@
     "tslib": "^2.4.0",
     "unist-util-visit": "^2.0.3",
     "utility-types": "^3.10.0",
-    "webpack": "^5.72.0"
+    "webpack": "^5.72.1"
   },
   "devDependencies": {
     "@docusaurus/types": "2.0.0-beta.20",
diff --git a/packages/docusaurus-plugin-content-blog/src/__tests__/authors.test.ts b/packages/docusaurus-plugin-content-blog/src/__tests__/authors.test.ts
index 67dd4571ea..19515459a6 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/authors.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/authors.test.ts
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
 import {
   type AuthorsMap,
   getAuthorsMap,
   getBlogPostAuthors,
   validateAuthorsMap,
 } from '../authors';
-import path from 'path';
 
 describe('getBlogPostAuthors', () => {
   it('can read no authors', () => {
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 5460a4440f..1d9cafef92 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/blogUtils.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/blogUtils.test.ts
@@ -6,6 +6,8 @@
  */
 
 import {jest} from '@jest/globals';
+import fs from 'fs-extra';
+import path from 'path';
 import {
   truncate,
   parseBlogFileName,
@@ -14,13 +16,8 @@ import {
   paginateBlogPosts,
   type LinkifyParams,
 } from '../blogUtils';
-import fs from 'fs-extra';
-import path from 'path';
-import type {
-  BlogBrokenMarkdownLink,
-  BlogContentPaths,
-  BlogPost,
-} from '../types';
+import type {BlogBrokenMarkdownLink, BlogContentPaths} from '../types';
+import type {BlogPost} from '@docusaurus/plugin-content-blog';
 
 describe('truncate', () => {
   it('truncates texts', () => {
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 f7d31a7dbb..48c3395f72 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts
@@ -8,11 +8,11 @@
 import {jest} from '@jest/globals';
 import path from 'path';
 import fs from 'fs-extra';
+import {DEFAULT_OPTIONS} from '../options';
+import {generateBlogPosts} from '../blogUtils';
 import {createBlogFeedFiles} from '../feed';
 import type {LoadContext, I18n} from '@docusaurus/types';
 import type {BlogContentPaths} from '../types';
-import {DEFAULT_OPTIONS} from '../options';
-import {generateBlogPosts} from '../blogUtils';
 import type {PluginOptions} from '@docusaurus/plugin-content-blog';
 
 const DefaultI18N: I18n = {
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 cb1020c680..36cc680df0 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/frontMatter.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/frontMatter.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {validateBlogPostFrontMatter} from '../frontMatter';
 import escapeStringRegexp from 'escape-string-regexp';
+import {validateBlogPostFrontMatter} from '../frontMatter';
 import type {BlogPostFrontMatter} from '@docusaurus/plugin-content-blog';
 
 // TODO this abstraction reduce verbosity but it makes it harder to debug
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 7d47e0027a..11b33cd2a1 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/index.test.ts
@@ -7,13 +7,13 @@
 
 import {jest} from '@jest/globals';
 import path from 'path';
-import pluginContentBlog from '../index';
-import type {DocusaurusConfig, LoadContext, I18n} from '@docusaurus/types';
-import {validateOptions} from '../options';
-import type {BlogPost} from '../types';
 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 {
+  BlogPost,
   PluginOptions,
   EditUrlFunction,
 } from '@docusaurus/plugin-content-blog';
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 8c8cbf9217..dd2e562bda 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/options.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import type {Options} from '@docusaurus/plugin-content-blog';
 
 function testValidate(options: Options) {
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 840a3af4d3..62442bbf81 100644
--- a/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-plugin-content-blog/src/__tests__/translations.test.ts
@@ -5,11 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {BlogPost, BlogContent} from '../types';
+import {updateTranslationFileMessages} from '@docusaurus/utils';
 import {getTranslationFiles, translateContent} from '../translations';
 import {DEFAULT_OPTIONS} from '../options';
-import {updateTranslationFileMessages} from '@docusaurus/utils';
-import type {PluginOptions} from '@docusaurus/plugin-content-blog';
+import type {
+  PluginOptions,
+  BlogPost,
+  BlogContent,
+} from '@docusaurus/plugin-content-blog';
 
 const sampleBlogOptions: PluginOptions = {
   ...DEFAULT_OPTIONS,
diff --git a/packages/docusaurus-plugin-content-blog/src/authors.ts b/packages/docusaurus-plugin-content-blog/src/authors.ts
index e8e2be3231..cf3bbe5c85 100644
--- a/packages/docusaurus-plugin-content-blog/src/authors.ts
+++ b/packages/docusaurus-plugin-content-blog/src/authors.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {BlogContentPaths} from './types';
 import {getDataFileData} from '@docusaurus/utils';
 import {Joi, URISchema} from '@docusaurus/utils-validation';
+import type {BlogContentPaths} from './types';
 import type {
   Author,
   BlogPostFrontMatter,
diff --git a/packages/docusaurus-plugin-content-blog/src/blogUtils.ts b/packages/docusaurus-plugin-content-blog/src/blogUtils.ts
index 5daf3983e0..370ddeb50a 100644
--- a/packages/docusaurus-plugin-content-blog/src/blogUtils.ts
+++ b/packages/docusaurus-plugin-content-blog/src/blogUtils.ts
@@ -7,9 +7,9 @@
 
 import fs from 'fs-extra';
 import path from 'path';
-import readingTime from 'reading-time';
 import _ from 'lodash';
-import type {BlogContentPaths, BlogMarkdownLoaderOptions} from './types';
+import logger from '@docusaurus/logger';
+import readingTime from 'reading-time';
 import {
   parseMarkdownString,
   normalizeUrl,
@@ -24,10 +24,9 @@ import {
   getFileCommitDate,
   getContentPathList,
 } from '@docusaurus/utils';
-import type {LoadContext} from '@docusaurus/types';
 import {validateBlogPostFrontMatter} from './frontMatter';
 import {type AuthorsMap, getAuthorsMap, getBlogPostAuthors} from './authors';
-import logger from '@docusaurus/logger';
+import type {LoadContext} from '@docusaurus/types';
 import type {
   PluginOptions,
   ReadingTimeFunction,
@@ -35,6 +34,7 @@ import type {
   BlogTags,
   BlogPaginated,
 } from '@docusaurus/plugin-content-blog';
+import type {BlogContentPaths, BlogMarkdownLoaderOptions} from './types';
 
 export function truncate(fileString: string, truncateMarker: RegExp): string {
   return fileString.split(truncateMarker, 1).shift()!;
diff --git a/packages/docusaurus-plugin-content-blog/src/feed.ts b/packages/docusaurus-plugin-content-blog/src/feed.ts
index 390d453f48..222fcb84b2 100644
--- a/packages/docusaurus-plugin-content-blog/src/feed.ts
+++ b/packages/docusaurus-plugin-content-blog/src/feed.ts
@@ -5,20 +5,20 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {Feed, type Author as FeedAuthor, type Item as FeedItem} from 'feed';
-import {normalizeUrl, readOutputHTMLFile} from '@docusaurus/utils';
-import {load as cheerioLoad} from 'cheerio';
-import type {DocusaurusConfig} from '@docusaurus/types';
 import path from 'path';
 import fs from 'fs-extra';
+import logger from '@docusaurus/logger';
+import {Feed, type Author as FeedAuthor, type Item as FeedItem} from 'feed';
+import {normalizeUrl, readOutputHTMLFile} from '@docusaurus/utils';
+import {blogPostContainerID} from '@docusaurus/utils-common';
+import {load as cheerioLoad} from 'cheerio';
+import type {DocusaurusConfig} from '@docusaurus/types';
 import type {
   FeedType,
   PluginOptions,
   Author,
   BlogPost,
 } from '@docusaurus/plugin-content-blog';
-import {blogPostContainerID} from '@docusaurus/utils-common';
-import logger from '@docusaurus/logger';
 
 async function generateBlogFeed({
   blogPosts,
diff --git a/packages/docusaurus-plugin-content-blog/src/index.ts b/packages/docusaurus-plugin-content-blog/src/index.ts
index 3b19b9bbab..a3dddc2404 100644
--- a/packages/docusaurus-plugin-content-blog/src/index.ts
+++ b/packages/docusaurus-plugin-content-blog/src/index.ts
@@ -6,8 +6,6 @@
  */
 
 import path from 'path';
-import admonitions from 'remark-admonitions';
-import footnoteIDFixer from './remark/footnoteIDFixer';
 import {
   normalizeUrl,
   docuHash,
@@ -23,17 +21,19 @@ import {
   type TagsListItem,
   type TagModule,
 } from '@docusaurus/utils';
-import {translateContent, getTranslationFiles} from './translations';
-
-import type {BlogContentPaths, BlogMarkdownLoaderOptions} from './types';
-import type {LoadContext, Plugin, HtmlTags} from '@docusaurus/types';
+import admonitions from 'remark-admonitions';
 import {
   generateBlogPosts,
   getSourceToPermalink,
   getBlogTags,
   paginateBlogPosts,
 } from './blogUtils';
+import footnoteIDFixer from './remark/footnoteIDFixer';
+import {translateContent, getTranslationFiles} from './translations';
 import {createBlogFeedFiles} from './feed';
+
+import type {BlogContentPaths, BlogMarkdownLoaderOptions} from './types';
+import type {LoadContext, Plugin, HtmlTags} from '@docusaurus/types';
 import type {
   PluginOptions,
   BlogPostFrontMatter,
diff --git a/packages/docusaurus-plugin-content-blog/src/plugin-content-blog.d.ts b/packages/docusaurus-plugin-content-blog/src/plugin-content-blog.d.ts
index d74bba9fc2..e8a8697fa8 100644
--- a/packages/docusaurus-plugin-content-blog/src/plugin-content-blog.d.ts
+++ b/packages/docusaurus-plugin-content-blog/src/plugin-content-blog.d.ts
@@ -538,11 +538,11 @@ declare module '@theme/BlogTagsListPage' {
 }
 
 declare module '@theme/BlogTagsPostsPage' {
+  import type {Content} from '@theme/BlogPostPage';
   import type {
     BlogSidebar,
     BlogPaginatedMetadata,
   } from '@docusaurus/plugin-content-blog';
-  import type {Content} from '@theme/BlogPostPage';
   import type {TagModule} from '@docusaurus/utils';
 
   export interface Props {
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index b6dbb6a34d..697fcf7224 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -38,7 +38,7 @@
     "remark-admonitions": "^1.2.1",
     "tslib": "^2.4.0",
     "utility-types": "^3.10.0",
-    "webpack": "^5.72.0"
+    "webpack": "^5.72.1"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.0.0-beta.20",
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 bd0db4e0ad..ec29bdcf8b 100644
Binary files a/packages/docusaurus-plugin-content-docs/src/__tests__/cli.test.ts and b/packages/docusaurus-plugin-content-docs/src/__tests__/cli.test.ts differ
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 bceca516cb..3e0f090109 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/docs.test.ts
@@ -8,6 +8,8 @@
 import {jest} from '@jest/globals';
 import path from 'path';
 import {loadContext} from '@docusaurus/core/src/server/index';
+import {createSlugger, posixPath, DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
+import {createSidebarsUtils} from '../sidebars/utils';
 import {
   processDocMetadata,
   readVersionDocs,
@@ -17,8 +19,9 @@ import {
   type DocEnv,
 } from '../docs';
 import {loadSidebars} from '../sidebars';
-import type {Sidebars} from '../sidebars/types';
 import {readVersionsMetadata} from '../versions';
+import {DEFAULT_OPTIONS} from '../options';
+import type {Sidebars} from '../sidebars/types';
 import type {DocFile} from '../types';
 import type {
   MetadataOptions,
@@ -29,10 +32,7 @@ import type {
   PropNavigationLink,
 } from '@docusaurus/plugin-content-docs';
 import type {LoadContext} from '@docusaurus/types';
-import {DEFAULT_OPTIONS} from '../options';
 import type {Optional} from 'utility-types';
-import {createSlugger, posixPath, DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
-import {createSidebarsUtils} from '../sidebars/utils';
 
 jest.setTimeout(15000);
 
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 3a0855fe58..6612927c2d 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/frontMatter.test.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import escapeStringRegexp from 'escape-string-regexp';
 import {validateDocFrontMatter} from '../frontMatter';
 import type {DocFrontMatter} from '@docusaurus/plugin-content-docs';
-import escapeStringRegexp from 'escape-string-regexp';
 
 function testField(params: {
   prefix: 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 0a0627c735..0d54d4bc13 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.ts
@@ -7,32 +7,27 @@
 
 import {jest} from '@jest/globals';
 import path from 'path';
+import fs from 'fs-extra';
+import _ from 'lodash';
 import {isMatch} from 'picomatch';
 import commander from 'commander';
-import _ from 'lodash';
-
-import fs from 'fs-extra';
-import pluginContentDocs from '../index';
+import webpack from 'webpack';
 import {loadContext} from '@docusaurus/core/src/server/index';
 import {applyConfigureWebpack} from '@docusaurus/core/src/webpack/utils';
-import type {RouteConfig} from '@docusaurus/types';
-import {posixPath} from '@docusaurus/utils';
 import {sortConfig} from '@docusaurus/core/src/server/plugins/routeConfig';
-
-import * as cliDocs from '../cli';
-import {validateOptions} from '../options';
+import {posixPath} from '@docusaurus/utils';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
-import type {LoadedVersion} from '../types';
-import type {
-  SidebarItem,
-  SidebarItemsGeneratorOption,
-  SidebarItemsGeneratorOptionArgs,
-} from '../sidebars/types';
-import {toSidebarsProp} from '../props';
 
-import webpack from 'webpack';
+import pluginContentDocs from '../index';
+import {toSidebarsProp} from '../props';
 import {DefaultSidebarItemsGenerator} from '../sidebars/generator';
 import {DisabledSidebars} from '../sidebars';
+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) {
   return version.docs.find((item) => item.unversionedId === unversionedId);
@@ -768,14 +763,14 @@ describe('site with custom sidebar items generator', () => {
     const customSidebarItemsGeneratorMock = jest.fn(async () => []);
     const {siteDir} = await loadSite(customSidebarItemsGeneratorMock);
 
-    const generatorArg: SidebarItemsGeneratorOptionArgs =
+    const generatorArg: Parameters<SidebarItemsGeneratorOption>[0] =
       customSidebarItemsGeneratorMock.mock.calls[0][0];
 
     // Make test pass even if docs are in different order and paths are
     // absolutes
     function makeDeterministic(
-      arg: SidebarItemsGeneratorOptionArgs,
-    ): SidebarItemsGeneratorOptionArgs {
+      arg: Parameters<SidebarItemsGeneratorOption>[0],
+    ): Parameters<SidebarItemsGeneratorOption>[0] {
       return {
         ...arg,
         docs: _.orderBy(arg.docs, 'id'),
diff --git a/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts b/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts
index 7f3e41bd19..47aff76053 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/lastUpdate.test.ts
@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {createTempRepo} from '@testing-utils/git';
 import {jest} from '@jest/globals';
 import fs from 'fs-extra';
 import path from 'path';
 import shell from 'shelljs';
+import {createTempRepo} from '@testing-utils/git';
 
 import {getFileLastUpdate} from '../lastUpdate';
 
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 5d5e330c50..bcbaccfe11 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/options.test.ts
@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {validateOptions, DEFAULT_OPTIONS} from '../options';
+import {GlobExcludeDefault} from '@docusaurus/utils';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import {DefaultSidebarItemsGenerator} from '../sidebars/generator';
 import {
   DefaultNumberPrefixParser,
   DisabledNumberPrefixParser,
 } from '../numberPrefix';
-import {GlobExcludeDefault} from '@docusaurus/utils';
 import type {Options} from '@docusaurus/plugin-content-docs';
 
 // The type of remark/rehype plugins can be function/object
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 85af2ef203..5d098e355f 100644
--- a/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-plugin-content-docs/src/__tests__/translations.test.ts
@@ -5,14 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {LoadedContent, LoadedVersion} from '../types';
+import {updateTranslationFileMessages} from '@docusaurus/utils';
 import {CURRENT_VERSION_NAME} from '../constants';
 import {
   getLoadedContentTranslationFiles,
   translateLoadedContent,
 } from '../translations';
-import type {DocMetadata} from '@docusaurus/plugin-content-docs';
-import {updateTranslationFileMessages} from '@docusaurus/utils';
+import type {
+  DocMetadata,
+  LoadedContent,
+  LoadedVersion,
+} from '@docusaurus/plugin-content-docs';
 
 function createSampleDoc(doc: Pick<DocMetadata, 'id'>): DocMetadata {
   return {
diff --git a/packages/docusaurus-plugin-content-docs/src/categoryGeneratedIndex.ts b/packages/docusaurus-plugin-content-docs/src/categoryGeneratedIndex.ts
index 4c87e711a5..6ae97213f1 100644
--- a/packages/docusaurus-plugin-content-docs/src/categoryGeneratedIndex.ts
+++ b/packages/docusaurus-plugin-content-docs/src/categoryGeneratedIndex.ts
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {type SidebarsUtils, toNavigationLink} from './sidebars/utils';
+import {createDocsByIdIndex} from './docs';
 import type {
   CategoryGeneratedIndexMetadata,
   DocMetadataBase,
 } from '@docusaurus/plugin-content-docs';
 import type {SidebarItemCategoryWithGeneratedIndex} from './sidebars/types';
-import {type SidebarsUtils, toNavigationLink} from './sidebars/utils';
-import {createDocsByIdIndex} from './docs';
 
 function getCategoryGeneratedIndexMetadata({
   category,
diff --git a/packages/docusaurus-plugin-content-docs/src/cli.ts b/packages/docusaurus-plugin-content-docs/src/cli.ts
index 4a84ea9530..11fc39b2c4 100644
--- a/packages/docusaurus-plugin-content-docs/src/cli.ts
+++ b/packages/docusaurus-plugin-content-docs/src/cli.ts
@@ -5,6 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import fs from 'fs-extra';
+import path from 'path';
+import logger from '@docusaurus/logger';
+import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import {
   getVersionsFilePath,
   getVersionDocsDirPath,
@@ -12,13 +16,9 @@ import {
   getDocsDirPathLocalized,
 } from './versions/files';
 import {validateVersionName} from './versions/validation';
-import fs from 'fs-extra';
-import path from 'path';
-import type {PluginOptions} from '@docusaurus/plugin-content-docs';
 import {loadSidebarsFileUnsafe} from './sidebars';
 import {CURRENT_VERSION_NAME} from './constants';
-import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
-import logger from '@docusaurus/logger';
+import type {PluginOptions} from '@docusaurus/plugin-content-docs';
 import type {LoadContext} from '@docusaurus/types';
 
 async function createVersionedSidebarFile({
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 e663dbd433..093aaad1db 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
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
 import {
   getActivePlugin,
   getLatestVersion,
@@ -17,7 +18,6 @@ import type {
   GlobalVersion,
   ActivePlugin,
 } from '@docusaurus/plugin-content-docs/client';
-import _ from 'lodash';
 
 describe('docsClientUtils', () => {
   it('getActivePlugin', () => {
diff --git a/packages/docusaurus-plugin-content-docs/src/docs.ts b/packages/docusaurus-plugin-content-docs/src/docs.ts
index 7f631f21c7..2ea127f99f 100644
--- a/packages/docusaurus-plugin-content-docs/src/docs.ts
+++ b/packages/docusaurus-plugin-content-docs/src/docs.ts
@@ -19,15 +19,12 @@ import {
   Globby,
   normalizeFrontMatterTags,
 } from '@docusaurus/utils';
-import type {LoadContext} from '@docusaurus/types';
 
 import {getFileLastUpdate} from './lastUpdate';
-import type {DocFile} from './types';
 import getSlug from './slug';
 import {CURRENT_VERSION_NAME} from './constants';
 import {stripPathNumberPrefixes} from './numberPrefix';
 import {validateDocFrontMatter} from './frontMatter';
-import type {SidebarsUtils} from './sidebars/utils';
 import {toDocNavigationLink, toNavigationLink} from './sidebars/utils';
 import type {
   MetadataOptions,
@@ -41,6 +38,9 @@ import type {
   DocFrontMatter,
   LoadedVersion,
 } from '@docusaurus/plugin-content-docs';
+import type {LoadContext} from '@docusaurus/types';
+import type {SidebarsUtils} from './sidebars/utils';
+import type {DocFile} from './types';
 
 type LastUpdateOptions = Pick<
   PluginOptions,
diff --git a/packages/docusaurus-plugin-content-docs/src/globalData.ts b/packages/docusaurus-plugin-content-docs/src/globalData.ts
index c688ab2c00..594e14c0f2 100644
--- a/packages/docusaurus-plugin-content-docs/src/globalData.ts
+++ b/packages/docusaurus-plugin-content-docs/src/globalData.ts
@@ -6,7 +6,6 @@
  */
 
 import _ from 'lodash';
-import type {Sidebars} from './sidebars/types';
 import {getMainDocId} from './docs';
 import type {FullVersion} from './types';
 import type {
@@ -18,6 +17,7 @@ import type {
   GlobalSidebar,
   GlobalDoc,
 } from '@docusaurus/plugin-content-docs/client';
+import type {Sidebars} from './sidebars/types';
 
 function toGlobalDataDoc(doc: DocMetadata): GlobalDoc {
   return {
diff --git a/packages/docusaurus-plugin-content-docs/src/index.ts b/packages/docusaurus-plugin-content-docs/src/index.ts
index b4c72107f3..422dfcbe3e 100644
--- a/packages/docusaurus-plugin-content-docs/src/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/index.ts
@@ -6,7 +6,8 @@
  */
 
 import path from 'path';
-
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
 import {
   normalizeUrl,
   docuHash,
@@ -19,20 +20,15 @@ import {
   createSlugger,
   DEFAULT_PLUGIN_ID,
 } from '@docusaurus/utils';
-import type {LoadContext, Plugin} from '@docusaurus/types';
 import {loadSidebars, resolveSidebarPathOption} from './sidebars';
 import {CategoryMetadataFilenamePattern} from './sidebars/generator';
-import type {DocEnv} from './docs';
-import {readVersionDocs, processDocMetadata, addDocNavigation} from './docs';
+import {
+  readVersionDocs,
+  processDocMetadata,
+  addDocNavigation,
+  type DocEnv,
+} from './docs';
 import {readVersionsMetadata} from './versions';
-import type {
-  SourceToPermalink,
-  DocFile,
-  DocsMarkdownOption,
-  VersionTag,
-  FullVersion,
-} from './types';
-import type {RuleSetRule} from 'webpack';
 import {cliDocsVersionCommand} from './cli';
 import {VERSIONS_JSON_FILE} from './constants';
 import {toGlobalDataVersion} from './globalData';
@@ -42,9 +38,10 @@ import {
   translateLoadedContent,
   getLoadedContentTranslationFiles,
 } from './translations';
-import logger from '@docusaurus/logger';
 import {getVersionTags} from './tags';
 import {createVersionRoutes} from './routes';
+import {createSidebarsUtils} from './sidebars/utils';
+
 import type {
   PropTagsListPage,
   PluginOptions,
@@ -54,8 +51,15 @@ import type {
   LoadedContent,
   LoadedVersion,
 } from '@docusaurus/plugin-content-docs';
-import {createSidebarsUtils} from './sidebars/utils';
-import _ from 'lodash';
+import type {LoadContext, Plugin} from '@docusaurus/types';
+import type {
+  SourceToPermalink,
+  DocFile,
+  DocsMarkdownOption,
+  VersionTag,
+  FullVersion,
+} from './types';
+import type {RuleSetRule} from 'webpack';
 
 export default async function pluginContentDocs(
   context: LoadContext,
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 0ca3678361..864d5a39c2 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
@@ -9,13 +9,13 @@ import {jest} from '@jest/globals';
 import fs from 'fs-extra';
 import path from 'path';
 import {linkify} from '../linkify';
+import {VERSIONED_DOCS_DIR, CURRENT_VERSION_NAME} from '../../constants';
 import type {
   DocsMarkdownOption,
   SourceToPermalink,
   DocBrokenMarkdownLink,
 } from '../../types';
 import type {VersionMetadata} from '@docusaurus/plugin-content-docs';
-import {VERSIONED_DOCS_DIR, CURRENT_VERSION_NAME} from '../../constants';
 
 function createFakeVersion({
   versionName,
diff --git a/packages/docusaurus-plugin-content-docs/src/markdown/linkify.ts b/packages/docusaurus-plugin-content-docs/src/markdown/linkify.ts
index 704bcbd497..ae651cb316 100644
--- a/packages/docusaurus-plugin-content-docs/src/markdown/linkify.ts
+++ b/packages/docusaurus-plugin-content-docs/src/markdown/linkify.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {DocsMarkdownOption} from '../types';
 import {replaceMarkdownLinks, getContentPathList} from '@docusaurus/utils';
+import type {DocsMarkdownOption} from '../types';
 
 function getVersion(filePath: string, options: DocsMarkdownOption) {
   const versionFound = options.versionsMetadata.find((version) =>
diff --git a/packages/docusaurus-plugin-content-docs/src/options.ts b/packages/docusaurus-plugin-content-docs/src/options.ts
index 258236acaa..047f59ff39 100644
--- a/packages/docusaurus-plugin-content-docs/src/options.ts
+++ b/packages/docusaurus-plugin-content-docs/src/options.ts
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {PluginOptions, Options} from '@docusaurus/plugin-content-docs';
+import logger from '@docusaurus/logger';
 import {
   Joi,
   RemarkPluginsSchema,
@@ -14,15 +14,14 @@ import {
   URISchema,
 } from '@docusaurus/utils-validation';
 import {GlobExcludeDefault} from '@docusaurus/utils';
-
-import type {OptionValidationContext} from '@docusaurus/types';
-import logger from '@docusaurus/logger';
 import admonitions from 'remark-admonitions';
 import {DefaultSidebarItemsGenerator} from './sidebars/generator';
 import {
   DefaultNumberPrefixParser,
   DisabledNumberPrefixParser,
 } from './numberPrefix';
+import type {OptionValidationContext} from '@docusaurus/types';
+import type {PluginOptions, Options} from '@docusaurus/plugin-content-docs';
 
 export const DEFAULT_OPTIONS: Omit<PluginOptions, 'id' | 'sidebarPath'> = {
   path: 'docs', // Path to data on filesystem, relative to site dir.
diff --git a/packages/docusaurus-plugin-content-docs/src/props.ts b/packages/docusaurus-plugin-content-docs/src/props.ts
index bf4393c631..8505d5de2c 100644
--- a/packages/docusaurus-plugin-content-docs/src/props.ts
+++ b/packages/docusaurus-plugin-content-docs/src/props.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
+import {createDocsByIdIndex} from './docs';
 import type {VersionTag} from './types';
 import type {
   SidebarItemDoc,
@@ -24,8 +26,6 @@ import type {
   DocMetadata,
   LoadedVersion,
 } from '@docusaurus/plugin-content-docs';
-import _ from 'lodash';
-import {createDocsByIdIndex} from './docs';
 
 export function toSidebarsProp(loadedVersion: LoadedVersion): PropSidebars {
   const docsById = createDocsByIdIndex(loadedVersion.docs);
diff --git a/packages/docusaurus-plugin-content-docs/src/routes.ts b/packages/docusaurus-plugin-content-docs/src/routes.ts
index 57f5722ba1..9a9205bee1 100644
--- a/packages/docusaurus-plugin-content-docs/src/routes.ts
+++ b/packages/docusaurus-plugin-content-docs/src/routes.ts
@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {PluginContentLoadedActions, RouteConfig} from '@docusaurus/types';
+import logger from '@docusaurus/logger';
 import {docuHash, createSlugger} from '@docusaurus/utils';
+import {toVersionMetadataProp} from './props';
+import type {PluginContentLoadedActions, RouteConfig} from '@docusaurus/types';
 import type {FullVersion} from './types';
 import type {
   CategoryGeneratedIndexMetadata,
   DocMetadata,
 } from '@docusaurus/plugin-content-docs';
-import {toVersionMetadataProp} from './props';
-import logger from '@docusaurus/logger';
 
 export async function createCategoryGeneratedIndexRoutes({
   version,
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/README.md b/packages/docusaurus-plugin-content-docs/src/sidebars/README.md
index 6b10e0602b..0f1f26e55e 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/README.md
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/README.md
@@ -6,4 +6,5 @@ This part is very complicated and hard to navigate. Sidebars are loaded through
 2. **Normalization**. The shorthands are expanded. This step is very lenient about the sidebars' shapes. Returns `NormalizedSidebars`.
 3. **Validation**. The normalized sidebars are validated. This step happens after normalization, because the normalized sidebars are easier to validate, and allows us to repeatedly validate & generate in the future.
 4. **Generation**. This step is done through the "processor" (naming is hard). The `autogenerated` items are unwrapped. In the future, steps 3 and 4 may be repeatedly done until all autogenerated items are unwrapped. Returns `ProcessedSidebars`.
+   - **Important**: this step should only care about unwrapping autogenerated items, not filtering them, writing additional metadata, applying defaults, etc.—everything will be handled in the post-processor. Important because the generator is exposed to the end-user and we want it to be easy to be reasoned about.
 5. **Post-processing**. Defaults are applied (collapsed states), category links are resolved, empty categories are flattened. Returns `Sidebars`.
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__fixtures__/sidebars/sidebars-category-index.json b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__fixtures__/sidebars/sidebars-category-index.json
new file mode 100644
index 0000000000..9e54b3d19e
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__fixtures__/sidebars/sidebars-category-index.json
@@ -0,0 +1,23 @@
+{
+  "docs": [
+    {
+      "label": "Tutorials",
+      "type": "category",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "tutorials"
+        }
+      ]
+    },
+    {
+      "label": "index-only",
+      "type": "category",
+      "link": {
+        "type": "doc",
+        "id": "tutorials/tutorial-basics"
+      },
+      "items": []
+    }
+  ]
+}
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__fixtures__/sidebars/sidebars-drafts.json b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__fixtures__/sidebars/sidebars-drafts.json
new file mode 100644
index 0000000000..52aedd8fd6
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__fixtures__/sidebars/sidebars-drafts.json
@@ -0,0 +1,60 @@
+{
+  "sidebar": [
+    "draft1",
+    {
+      "type": "category",
+      "label": "all drafts",
+      "items": [
+        "draft2",
+        "draft3"
+      ]
+    },
+    {
+      "type": "category",
+      "label": "all drafts",
+      "link": {
+        "type": "generated-index"
+      },
+      "items": [
+        "draft2",
+        "draft3"
+      ]
+    },
+    {
+      "type": "category",
+      "label": "all drafts",
+      "link": {
+        "type": "doc",
+        "id": "draft1"
+      },
+      "items": [
+        "draft2",
+        "draft3"
+      ]
+    },
+    {
+      "type": "category",
+      "label": "index not draft",
+      "link": {
+        "type": "doc",
+        "id": "not-draft"
+      },
+      "items": [
+        "draft2",
+        "draft3"
+      ]
+    },
+    {
+      "type": "category",
+      "label": "subitem not draft",
+      "link": {
+        "type": "doc",
+        "id": "draft1"
+      },
+      "items": [
+        "not-draft",
+        "draft3"
+      ]
+    }
+  ]
+}
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/index.test.ts.snap
index f5b2acdd51..608ffc7538 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/index.test.ts.snap
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/index.test.ts.snap
@@ -1,5 +1,56 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`loadSidebars loads sidebars with index-only categories 1`] = `
+{
+  "docs": [
+    {
+      "collapsed": true,
+      "collapsible": true,
+      "items": [
+        {
+          "id": "tutorials/tutorial-basics",
+          "label": "tutorial-basics",
+          "type": "doc",
+        },
+      ],
+      "label": "Tutorials",
+      "link": undefined,
+      "type": "category",
+    },
+    {
+      "id": "tutorials/tutorial-basics",
+      "label": "index-only",
+      "type": "doc",
+    },
+  ],
+}
+`;
+
+exports[`loadSidebars loads sidebars with interspersed draft items 1`] = `
+{
+  "sidebar": [
+    {
+      "id": "not-draft",
+      "label": "index not draft",
+      "type": "doc",
+    },
+    {
+      "collapsed": true,
+      "collapsible": true,
+      "items": [
+        {
+          "id": "not-draft",
+          "type": "doc",
+        },
+      ],
+      "label": "subitem not draft",
+      "link": undefined,
+      "type": "category",
+    },
+  ],
+}
+`;
+
 exports[`loadSidebars sidebars link 1`] = `
 {
   "docs": [
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/postProcessor.test.ts.snap b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/postProcessor.test.ts.snap
index cb42628261..3284571628 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/postProcessor.test.ts.snap
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/__tests__/__snapshots__/postProcessor.test.ts.snap
@@ -60,14 +60,21 @@ exports[`postProcess corrects collapsed state inconsistencies 3`] = `
 }
 `;
 
-exports[`postProcess transforms category without subitems 1`] = `
+exports[`postProcess filters draft items 1`] = `
 {
   "sidebar": [
     {
-      "href": "version/generated/permalink",
+      "id": "another",
       "label": "Category",
-      "type": "link",
+      "type": "doc",
     },
+  ],
+}
+`;
+
+exports[`postProcess transforms category without subitems 1`] = `
+{
+  "sidebar": [
     {
       "id": "doc ID",
       "label": "Category 2",
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 66281f746b..671c12cfe2 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
@@ -7,9 +7,9 @@
 
 import {jest} from '@jest/globals';
 import {DefaultSidebarItemsGenerator} from '../generator';
-import type {SidebarItemsGenerator} from '../types';
 import {DefaultNumberPrefixParser} from '../../numberPrefix';
 import {isCategoryIndex} from '../../docs';
+import type {SidebarItemsGenerator} from '../types';
 
 describe('DefaultSidebarItemsGenerator', () => {
   function testDefaultSidebarItemsGenerator(
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 3a92144ffd..5a1eed4f1d 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
@@ -7,9 +7,10 @@
 
 import {jest} from '@jest/globals';
 import path from 'path';
+import {createSlugger} from '@docusaurus/utils';
 import {loadSidebars, DisabledSidebars} from '../index';
-import type {SidebarProcessorParams} from '../types';
 import {DefaultSidebarItemsGenerator} from '../generator';
+import type {SidebarProcessorParams} from '../types';
 import type {DocMetadata} from '@docusaurus/plugin-content-docs';
 
 describe('loadSidebars', () => {
@@ -27,6 +28,7 @@ describe('loadSidebars', () => {
     ],
     drafts: [],
     version: {
+      path: 'version',
       contentPath: path.join(fixtureDir, 'docs'),
       contentPathLocalized: path.join(fixtureDir, 'docs'),
     },
@@ -124,6 +126,32 @@ describe('loadSidebars', () => {
     expect(result).toMatchSnapshot();
   });
 
+  it('loads sidebars with index-only categories', async () => {
+    const sidebarPath = path.join(fixtureDir, 'sidebars-category-index.json');
+    const result = await loadSidebars(sidebarPath, {
+      ...params,
+      docs: [
+        {
+          id: 'tutorials/tutorial-basics',
+          source: '@site/docs/tutorials/tutorial-basics/index.md',
+          sourceDirName: 'tutorials/tutorial-basics',
+          frontMatter: {},
+        },
+      ],
+    });
+    expect(result).toMatchSnapshot();
+  });
+
+  it('loads sidebars with interspersed draft items', async () => {
+    const sidebarPath = path.join(fixtureDir, 'sidebars-drafts.json');
+    const result = await loadSidebars(sidebarPath, {
+      ...params,
+      drafts: [{id: 'draft1'}, {id: 'draft2'}, {id: 'draft3'}],
+      categoryLabelSlugger: createSlugger(),
+    });
+    expect(result).toMatchSnapshot();
+  });
+
   it('duplicate category metadata files', async () => {
     const sidebarPath = path.join(
       fixtureDir,
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 a1a8e56d8f..16196c7c3d 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
@@ -35,6 +35,7 @@ describe('postProcess', () => {
       {
         sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
         version: {path: 'version'},
+        drafts: [],
       },
     );
 
@@ -54,6 +55,7 @@ describe('postProcess', () => {
         {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
           version: {path: 'version'},
+          drafts: [],
         },
       );
     }).toThrowErrorMatchingInlineSnapshot(
@@ -79,6 +81,7 @@ describe('postProcess', () => {
         {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
           version: {path: 'version'},
+          drafts: [],
         },
       ),
     ).toMatchSnapshot();
@@ -99,6 +102,7 @@ describe('postProcess', () => {
         {
           sidebarOptions: {sidebarCollapsed: false, sidebarCollapsible: false},
           version: {path: 'version'},
+          drafts: [],
         },
       ),
     ).toMatchSnapshot();
@@ -118,6 +122,37 @@ describe('postProcess', () => {
         {
           sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: false},
           version: {path: 'version'},
+          drafts: [],
+        },
+      ),
+    ).toMatchSnapshot();
+  });
+
+  it('filters draft items', () => {
+    expect(
+      postProcessSidebars(
+        {
+          sidebar: [
+            {
+              type: 'category',
+              label: 'Category',
+              items: [{type: 'doc', id: 'foo'}],
+            },
+            {
+              type: 'category',
+              label: 'Category',
+              link: {
+                type: 'doc',
+                id: 'another',
+              },
+              items: [{type: 'doc', id: 'foo'}],
+            },
+          ],
+        },
+        {
+          sidebarOptions: {sidebarCollapsed: true, sidebarCollapsible: true},
+          version: {path: 'version'},
+          drafts: [{id: 'foo', unversionedId: 'foo'}],
         },
       ),
     ).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 079040879a..d0a530bbd7 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
@@ -6,7 +6,11 @@
  */
 
 import {jest} from '@jest/globals';
+import {createSlugger} from '@docusaurus/utils';
 import {processSidebars} from '../processor';
+import {DefaultSidebarItemsGenerator} from '../generator';
+import {DefaultNumberPrefixParser} from '../../numberPrefix';
+import {isCategoryIndex} from '../../docs';
 import type {
   SidebarItem,
   SidebarItemsGenerator,
@@ -16,11 +20,7 @@ import type {
   CategoryMetadataFile,
   ProcessedSidebars,
 } from '../types';
-import {DefaultSidebarItemsGenerator} from '../generator';
-import {createSlugger} from '@docusaurus/utils';
 import type {VersionMetadata} from '@docusaurus/plugin-content-docs';
-import {DefaultNumberPrefixParser} from '../../numberPrefix';
-import {isCategoryIndex} from '../../docs';
 
 describe('processSidebars', () => {
   function createStaticSidebarItemGenerator(
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts
index 67320e7888..56e0025a81 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/generator.ts
@@ -5,6 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import {addTrailingSlash} from '@docusaurus/utils';
+import {createDocsByIdIndex, toCategoryIndexMatcherParam} from '../docs';
 import type {
   SidebarItemDoc,
   SidebarItemsGenerator,
@@ -13,11 +18,6 @@ import type {
   NormalizedSidebarItem,
   SidebarItemCategoryLinkConfig,
 } from './types';
-import _ from 'lodash';
-import {addTrailingSlash} from '@docusaurus/utils';
-import logger from '@docusaurus/logger';
-import path from 'path';
-import {createDocsByIdIndex, toCategoryIndexMatcherParam} from '../docs';
 
 const BreadcrumbSeparator = '/';
 
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/index.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/index.ts
index f99b03374a..36bd576f7f 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/index.ts
@@ -6,19 +6,19 @@
  */
 
 import fs from 'fs-extra';
+import path from 'path';
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import {Globby} from '@docusaurus/utils';
+import Yaml from 'js-yaml';
+import combinePromises from 'combine-promises';
 import importFresh from 'import-fresh';
-import type {SidebarsConfig, Sidebars, SidebarProcessorParams} from './types';
 import {validateSidebars, validateCategoryMetadataFile} from './validation';
 import {normalizeSidebars} from './normalization';
 import {processSidebars} from './processor';
 import {postProcessSidebars} from './postProcessor';
-import path from 'path';
-import {Globby} from '@docusaurus/utils';
-import logger from '@docusaurus/logger';
 import type {PluginOptions} from '@docusaurus/plugin-content-docs';
-import Yaml from 'js-yaml';
-import _ from 'lodash';
-import combinePromises from 'combine-promises';
+import type {SidebarsConfig, Sidebars, SidebarProcessorParams} from './types';
 
 export const DefaultSidebars: SidebarsConfig = {
   defaultSidebar: [
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/normalization.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/normalization.ts
index d36be98fcd..4d51e25444 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/normalization.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/normalization.ts
@@ -5,6 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import {isCategoriesShorthand} from './utils';
 import type {
   NormalizedSidebarItem,
   NormalizedSidebar,
@@ -16,9 +19,6 @@ import type {
   SidebarsConfig,
   NormalizedSidebarItemCategory,
 } from './types';
-import {isCategoriesShorthand} from './utils';
-import _ from 'lodash';
-import logger from '@docusaurus/logger';
 
 function normalizeCategoriesShorthand(
   sidebar: SidebarCategoriesShorthand,
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
index ac662291d3..307ed9de86 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/postProcessor.ts
@@ -5,7 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
 import {normalizeUrl} from '@docusaurus/utils';
+import {getDocIds} from '../docs';
 import type {
   SidebarItem,
   Sidebars,
@@ -15,12 +17,18 @@ import type {
   ProcessedSidebars,
   SidebarItemCategoryLink,
 } from './types';
-import _ from 'lodash';
+
+type SidebarPostProcessorParams = SidebarProcessorParams & {
+  draftIds: Set<string>;
+};
 
 function normalizeCategoryLink(
   category: ProcessedSidebarItemCategory,
-  params: SidebarProcessorParams,
+  params: SidebarPostProcessorParams,
 ): SidebarItemCategoryLink | undefined {
+  if (category.link?.type === 'doc' && params.draftIds.has(category.link.id)) {
+    return undefined;
+  }
   if (category.link?.type === 'generated-index') {
     // Default slug logic can be improved
     const getDefaultSlug = () =>
@@ -38,37 +46,42 @@ function normalizeCategoryLink(
 
 function postProcessSidebarItem(
   item: ProcessedSidebarItem,
-  params: SidebarProcessorParams,
-): SidebarItem {
+  params: SidebarPostProcessorParams,
+): SidebarItem | null {
   if (item.type === 'category') {
+    // Fail-fast if there's actually no subitems, no because all subitems are
+    // drafts. This is likely a configuration mistake.
+    if (item.items.length === 0 && !item.link) {
+      throw new Error(
+        `Sidebar category ${item.label} has neither any subitem nor a link. This makes this item not able to link to anything.`,
+      );
+    }
     const category = {
       ...item,
       collapsed: item.collapsed ?? params.sidebarOptions.sidebarCollapsed,
       collapsible: item.collapsible ?? params.sidebarOptions.sidebarCollapsible,
       link: normalizeCategoryLink(item, params),
-      items: item.items.map((subItem) =>
-        postProcessSidebarItem(subItem, params),
-      ),
+      items: item.items
+        .map((subItem) => postProcessSidebarItem(subItem, params))
+        .filter((v): v is SidebarItem => Boolean(v)),
     };
     // If the current category doesn't have subitems, we render a normal link
     // instead.
     if (category.items.length === 0) {
-      if (!category.link) {
-        throw new Error(
-          `Sidebar category ${item.label} has neither any subitem nor a link. This makes this item not able to link to anything.`,
-        );
+      // Doesn't make sense to render an empty generated index page, so we
+      // filter the entire category out as well.
+      if (
+        !category.link ||
+        category.link.type === 'generated-index' ||
+        params.draftIds.has(category.link.id)
+      ) {
+        return null;
       }
-      return category.link.type === 'doc'
-        ? {
-            type: 'doc',
-            label: category.label,
-            id: category.link.id,
-          }
-        : {
-            type: 'link',
-            label: category.label,
-            href: category.link.permalink,
-          };
+      return {
+        type: 'doc',
+        label: category.label,
+        id: category.link.id,
+      };
     }
     // A non-collapsible category can't be collapsed!
     if (category.collapsible === false) {
@@ -76,6 +89,12 @@ function postProcessSidebarItem(
     }
     return category;
   }
+  if (
+    (item.type === 'doc' || item.type === 'ref') &&
+    params.draftIds.has(item.id)
+  ) {
+    return null;
+  }
   return item;
 }
 
@@ -83,7 +102,11 @@ export function postProcessSidebars(
   sidebars: ProcessedSidebars,
   params: SidebarProcessorParams,
 ): Sidebars {
+  const draftIds = new Set(params.drafts.flatMap(getDocIds));
+
   return _.mapValues(sidebars, (sidebar) =>
-    sidebar.map((item) => postProcessSidebarItem(item, params)),
+    sidebar
+      .map((item) => postProcessSidebarItem(item, {...params, draftIds}))
+      .filter((v): v is SidebarItem => Boolean(v)),
   );
 }
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/processor.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/processor.ts
index b0153e9dcb..7949ad2216 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/processor.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/processor.ts
@@ -5,6 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
+import combinePromises from 'combine-promises';
+import {DefaultSidebarItemsGenerator} from './generator';
+import {validateSidebars} from './validation';
+import {isCategoryIndex} from '../docs';
 import type {
   DocMetadataBase,
   VersionMetadata,
@@ -22,11 +27,6 @@ import type {
   SidebarProcessorParams,
   CategoryMetadataFile,
 } from './types';
-import {DefaultSidebarItemsGenerator} from './generator';
-import {validateSidebars} from './validation';
-import _ from 'lodash';
-import combinePromises from 'combine-promises';
-import {getDocIds, isCategoryIndex} from '../docs';
 
 function toSidebarItemsGeneratorDoc(
   doc: DocMetadataBase,
@@ -55,8 +55,7 @@ async function processSidebar(
   categoriesMetadata: {[filePath: string]: CategoryMetadataFile},
   params: SidebarProcessorParams,
 ): Promise<ProcessedSidebar> {
-  const {sidebarItemsGenerator, numberPrefixParser, docs, drafts, version} =
-    params;
+  const {sidebarItemsGenerator, numberPrefixParser, docs, version} = params;
 
   // Just a minor lazy transformation optimization
   const getSidebarItemsGeneratorDocsAndVersion = _.memoize(() => ({
@@ -82,19 +81,6 @@ async function processSidebar(
     return processItems(generatedItems);
   }
 
-  const draftIds = new Set(drafts.flatMap(getDocIds));
-
-  const isDraftItem = (item: NormalizedSidebarItem): boolean => {
-    if (item.type === 'doc' || item.type === 'ref') {
-      return draftIds.has(item.id);
-    }
-    // If a category only contains draft items, it should be filtered entirely.
-    if (item.type === 'category') {
-      return item.items.every(isDraftItem);
-    }
-    return false;
-  };
-
   async function processItem(
     item: NormalizedSidebarItem,
   ): Promise<ProcessedSidebarItem[]> {
@@ -102,7 +88,7 @@ async function processSidebar(
       return [
         {
           ...item,
-          items: await processItems(item.items),
+          items: (await Promise.all(item.items.map(processItem))).flat(),
         },
       ];
     }
@@ -115,9 +101,7 @@ async function processSidebar(
   async function processItems(
     items: NormalizedSidebarItem[],
   ): Promise<ProcessedSidebarItem[]> {
-    return (
-      await Promise.all(items.filter((i) => !isDraftItem(i)).map(processItem))
-    ).flat();
+    return (await Promise.all(items.map(processItem))).flat();
   }
 
   const processedSidebar = await processItems(unprocessedSidebar);
diff --git a/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts b/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts
index ee27177c1e..a213b2e7de 100644
--- a/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts
+++ b/packages/docusaurus-plugin-content-docs/src/sidebars/utils.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
+import {toMessageRelativeFilePath} from '@docusaurus/utils';
 import type {
   Sidebars,
   Sidebar,
@@ -18,9 +20,6 @@ import type {
   SidebarItemCategoryWithGeneratedIndex,
   SidebarNavigationItem,
 } from './types';
-
-import _ from 'lodash';
-import {toMessageRelativeFilePath} from '@docusaurus/utils';
 import type {
   DocMetadataBase,
   PropNavigationLink,
diff --git a/packages/docusaurus-plugin-content-docs/src/tags.ts b/packages/docusaurus-plugin-content-docs/src/tags.ts
index 1de963d81f..dfa0e32845 100644
--- a/packages/docusaurus-plugin-content-docs/src/tags.ts
+++ b/packages/docusaurus-plugin-content-docs/src/tags.ts
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
 import {groupTaggedItems} from '@docusaurus/utils';
 import type {VersionTags} from './types';
 import type {DocMetadata} from '@docusaurus/plugin-content-docs';
-import _ from 'lodash';
 
 export function getVersionTags(docs: DocMetadata[]): VersionTags {
   const groups = groupTaggedItems(docs, (doc) => doc.tags);
diff --git a/packages/docusaurus-plugin-content-docs/src/translations.ts b/packages/docusaurus-plugin-content-docs/src/translations.ts
index f5f2f7e719..abc56ac65b 100644
--- a/packages/docusaurus-plugin-content-docs/src/translations.ts
+++ b/packages/docusaurus-plugin-content-docs/src/translations.ts
@@ -5,6 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
+import {mergeTranslations} from '@docusaurus/utils';
+import {CURRENT_VERSION_NAME} from './constants';
+import {
+  collectSidebarCategories,
+  transformSidebarItems,
+  collectSidebarLinks,
+} from './sidebars/utils';
 import type {
   LoadedVersion,
   LoadedContent,
@@ -15,20 +23,11 @@ import type {
   SidebarItemCategoryLink,
   Sidebars,
 } from './sidebars/types';
-
-import _ from 'lodash';
-import {
-  collectSidebarCategories,
-  transformSidebarItems,
-  collectSidebarLinks,
-} from './sidebars/utils';
 import type {
   TranslationFileContent,
   TranslationFile,
   TranslationMessage,
 } from '@docusaurus/types';
-import {mergeTranslations} from '@docusaurus/utils';
-import {CURRENT_VERSION_NAME} from './constants';
 
 function getVersionFileName(versionName: string): string {
   if (versionName === CURRENT_VERSION_NAME) {
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 c019d8a3ae..4a3448460a 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
@@ -7,9 +7,9 @@
 
 import {jest} from '@jest/globals';
 import path from 'path';
+import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import {readVersionsMetadata} from '../index';
 import {DEFAULT_OPTIONS} from '../../options';
-import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import type {I18n} from '@docusaurus/types';
 import type {
   PluginOptions,
diff --git a/packages/docusaurus-plugin-content-docs/src/versions/files.ts b/packages/docusaurus-plugin-content-docs/src/versions/files.ts
index 69660f34a9..6b7464ee30 100644
--- a/packages/docusaurus-plugin-content-docs/src/versions/files.ts
+++ b/packages/docusaurus-plugin-content-docs/src/versions/files.ts
@@ -7,6 +7,7 @@
 
 import path from 'path';
 import fs from 'fs-extra';
+import {getPluginI18nPath, DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import {
   VERSIONS_JSON_FILE,
   VERSIONED_DOCS_DIR,
@@ -14,7 +15,6 @@ import {
   CURRENT_VERSION_NAME,
 } from '../constants';
 import {validateVersionNames} from './validation';
-import {getPluginI18nPath, DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
 import type {
   PluginOptions,
   VersionMetadata,
diff --git a/packages/docusaurus-plugin-content-docs/src/versions/index.ts b/packages/docusaurus-plugin-content-docs/src/versions/index.ts
index cd85ddf213..369e0fd6ef 100644
--- a/packages/docusaurus-plugin-content-docs/src/versions/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/versions/index.ts
@@ -6,8 +6,8 @@
  */
 
 import path from 'path';
-import {CURRENT_VERSION_NAME} from '../constants';
 import {normalizeUrl, posixPath} from '@docusaurus/utils';
+import {CURRENT_VERSION_NAME} from '../constants';
 import {validateVersionsOptions} from './validation';
 import {
   getDocsDirPathLocalized,
diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json
index f5882af81a..4e8e2eb7ed 100644
--- a/packages/docusaurus-plugin-content-pages/package.json
+++ b/packages/docusaurus-plugin-content-pages/package.json
@@ -25,7 +25,7 @@
     "fs-extra": "^10.1.0",
     "remark-admonitions": "^1.2.1",
     "tslib": "^2.4.0",
-    "webpack": "^5.72.0"
+    "webpack": "^5.72.1"
   },
   "devDependencies": {
     "@docusaurus/types": "2.0.0-beta.20"
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 89221c819b..f3b94d2df5 100644
--- a/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.ts
+++ b/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.ts
@@ -7,10 +7,10 @@
 
 import path from 'path';
 import {loadContext} from '@docusaurus/core/lib/server';
+import {normalizePluginOptions} from '@docusaurus/utils-validation';
 
 import pluginContentPages from '../index';
 import {validateOptions} from '../options';
-import {normalizePluginOptions} from '@docusaurus/utils-validation';
 
 describe('docusaurus-plugin-content-pages', () => {
   it('loads simple pages', async () => {
diff --git a/packages/docusaurus-plugin-content-pages/src/__tests__/options.test.ts b/packages/docusaurus-plugin-content-pages/src/__tests__/options.test.ts
index 9365b614cd..d92d691e7d 100644
--- a/packages/docusaurus-plugin-content-pages/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-content-pages/src/__tests__/options.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import {validateOptions, DEFAULT_OPTIONS} from '../options';
 import type {Options} from '@docusaurus/plugin-content-pages';
 
 function testValidate(options: Options) {
diff --git a/packages/docusaurus-plugin-content-pages/src/index.ts b/packages/docusaurus-plugin-content-pages/src/index.ts
index 5bd819610b..66bcb0d157 100644
--- a/packages/docusaurus-plugin-content-pages/src/index.ts
+++ b/packages/docusaurus-plugin-content-pages/src/index.ts
@@ -21,10 +21,10 @@ import {
   DEFAULT_PLUGIN_ID,
   parseMarkdownString,
 } from '@docusaurus/utils';
-import type {LoadContext, Plugin} from '@docusaurus/types';
 import admonitions from 'remark-admonitions';
 import {validatePageFrontMatter} from './frontMatter';
 
+import type {LoadContext, Plugin} from '@docusaurus/types';
 import type {PagesContentPaths} from './types';
 import type {
   PluginOptions,
diff --git a/packages/docusaurus-plugin-content-pages/src/options.ts b/packages/docusaurus-plugin-content-pages/src/options.ts
index 9713fea810..475ed83110 100644
--- a/packages/docusaurus-plugin-content-pages/src/options.ts
+++ b/packages/docusaurus-plugin-content-pages/src/options.ts
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {PluginOptions, Options} from '@docusaurus/plugin-content-pages';
 import {
   Joi,
   RemarkPluginsSchema,
@@ -14,6 +13,7 @@ import {
 } from '@docusaurus/utils-validation';
 import {GlobExcludeDefault} from '@docusaurus/utils';
 import type {OptionValidationContext} from '@docusaurus/types';
+import type {PluginOptions, Options} from '@docusaurus/plugin-content-pages';
 
 export const DEFAULT_OPTIONS: PluginOptions = {
   path: 'src/pages', // Path to data on filesystem, relative to site dir.
diff --git a/packages/docusaurus-plugin-debug/src/index.ts b/packages/docusaurus-plugin-debug/src/index.ts
index 62e650824f..7ca3680678 100644
--- a/packages/docusaurus-plugin-debug/src/index.ts
+++ b/packages/docusaurus-plugin-debug/src/index.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {LoadContext, Plugin} from '@docusaurus/types';
-import {docuHash, normalizeUrl, posixPath} from '@docusaurus/utils';
 import path from 'path';
+import {docuHash, normalizeUrl, posixPath} from '@docusaurus/utils';
+import type {LoadContext, Plugin} from '@docusaurus/types';
 
 export default function pluginDebug({
   siteConfig: {baseUrl},
diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugConfig/index.tsx b/packages/docusaurus-plugin-debug/src/theme/DebugConfig/index.tsx
index 373fd530ef..6b110b8ab1 100644
--- a/packages/docusaurus-plugin-debug/src/theme/DebugConfig/index.tsx
+++ b/packages/docusaurus-plugin-debug/src/theme/DebugConfig/index.tsx
@@ -6,12 +6,10 @@
  */
 
 import React from 'react';
-
+import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import DebugLayout from '@theme/DebugLayout';
 import DebugJsonView from '@theme/DebugJsonView';
 
-import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-
 export default function DebugMetadata(): JSX.Element {
   const {siteConfig} = useDocusaurusContext();
   return (
diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugGlobalData/index.tsx b/packages/docusaurus-plugin-debug/src/theme/DebugGlobalData/index.tsx
index 2a1b28b73f..f66df5b7dd 100644
--- a/packages/docusaurus-plugin-debug/src/theme/DebugGlobalData/index.tsx
+++ b/packages/docusaurus-plugin-debug/src/theme/DebugGlobalData/index.tsx
@@ -6,10 +6,9 @@
  */
 
 import React from 'react';
-
+import useGlobalData from '@docusaurus/useGlobalData';
 import DebugLayout from '@theme/DebugLayout';
 import DebugJsonView from '@theme/DebugJsonView';
-import useGlobalData from '@docusaurus/useGlobalData';
 
 export default function DebugMetadata(): JSX.Element {
   const globalData = useGlobalData();
diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugRegistry/index.tsx b/packages/docusaurus-plugin-debug/src/theme/DebugRegistry/index.tsx
index b937bf9040..59cd4c7c21 100644
--- a/packages/docusaurus-plugin-debug/src/theme/DebugRegistry/index.tsx
+++ b/packages/docusaurus-plugin-debug/src/theme/DebugRegistry/index.tsx
@@ -6,9 +6,8 @@
  */
 
 import React from 'react';
-
-import DebugLayout from '@theme/DebugLayout';
 import registry from '@generated/registry';
+import DebugLayout from '@theme/DebugLayout';
 import styles from './styles.module.css';
 
 export default function DebugRegistry(): JSX.Element {
diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/index.tsx b/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/index.tsx
index d9d3c5b5fa..43b922ba91 100644
--- a/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/index.tsx
+++ b/packages/docusaurus-plugin-debug/src/theme/DebugRoutes/index.tsx
@@ -6,10 +6,9 @@
  */
 
 import React from 'react';
-
+import routes from '@generated/routes';
 import DebugLayout from '@theme/DebugLayout';
 import DebugJsonView from '@theme/DebugJsonView';
-import routes from '@generated/routes';
 import styles from './styles.module.css';
 
 export default function DebugRoutes(): JSX.Element {
diff --git a/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx b/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx
index a30cc3bbc6..64d3954842 100644
--- a/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx
+++ b/packages/docusaurus-plugin-debug/src/theme/DebugSiteMetadata/index.tsx
@@ -6,9 +6,8 @@
  */
 
 import React from 'react';
-
-import DebugLayout from '@theme/DebugLayout';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import DebugLayout from '@theme/DebugLayout';
 import styles from './styles.module.css';
 
 export default function DebugMetadata(): JSX.Element {
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index 7c35c575b0..6f6c73d117 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -30,7 +30,7 @@
     "react-waypoint": "^10.1.0",
     "sharp": "^0.30.4",
     "tslib": "^2.4.0",
-    "webpack": "^5.72.0"
+    "webpack": "^5.72.1"
   },
   "devDependencies": {
     "@docusaurus/module-type-aliases": "2.0.0-beta.20",
diff --git a/packages/docusaurus-plugin-ideal-image/src/index.ts b/packages/docusaurus-plugin-ideal-image/src/index.ts
index 727eb1adc5..d650e33b10 100644
--- a/packages/docusaurus-plugin-ideal-image/src/index.ts
+++ b/packages/docusaurus-plugin-ideal-image/src/index.ts
@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {Joi} from '@docusaurus/utils-validation';
+import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
 import type {
   LoadContext,
   Plugin,
   OptionValidationContext,
 } from '@docusaurus/types';
 import type {PluginOptions} from '@docusaurus/plugin-ideal-image';
-import {Joi} from '@docusaurus/utils-validation';
-import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
 
 export default function pluginIdealImage(
   context: LoadContext,
diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json
index 6d5271bbc2..3f0a4f8201 100644
--- a/packages/docusaurus-plugin-pwa/package.json
+++ b/packages/docusaurus-plugin-pwa/package.json
@@ -29,10 +29,10 @@
     "@docusaurus/utils-validation": "2.0.0-beta.20",
     "babel-loader": "^8.2.5",
     "clsx": "^1.1.1",
-    "core-js": "^3.22.4",
+    "core-js": "^3.22.5",
     "terser-webpack-plugin": "^5.3.1",
     "tslib": "^2.4.0",
-    "webpack": "^5.72.0",
+    "webpack": "^5.72.1",
     "webpack-merge": "^5.8.0",
     "workbox-build": "^6.5.3",
     "workbox-precaching": "^6.5.3",
diff --git a/packages/docusaurus-plugin-pwa/src/index.ts b/packages/docusaurus-plugin-pwa/src/index.ts
index 7150eae5f6..7ec58b25f4 100644
--- a/packages/docusaurus-plugin-pwa/src/index.ts
+++ b/packages/docusaurus-plugin-pwa/src/index.ts
@@ -5,18 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {HtmlTags, LoadContext, Plugin} from '@docusaurus/types';
-import type {PluginOptions} from '@docusaurus/plugin-pwa';
+import path from 'path';
+import webpack, {type Configuration} from 'webpack';
+import Terser from 'terser-webpack-plugin';
+import {injectManifest} from 'workbox-build';
 import {normalizeUrl} from '@docusaurus/utils';
 import {compile} from '@docusaurus/core/lib/webpack/utils';
 import LogPlugin from '@docusaurus/core/lib/webpack/plugins/LogPlugin';
 import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
-
-import path from 'path';
-import webpack, {type Configuration} from 'webpack';
-import Terser from 'terser-webpack-plugin';
-
-import {injectManifest} from 'workbox-build';
+import type {HtmlTags, LoadContext, Plugin} from '@docusaurus/types';
+import type {PluginOptions} from '@docusaurus/plugin-pwa';
 
 const isProd = process.env.NODE_ENV === 'production';
 
diff --git a/packages/docusaurus-plugin-pwa/src/theme/PwaReloadPopup/index.tsx b/packages/docusaurus-plugin-pwa/src/theme/PwaReloadPopup/index.tsx
index 20e8490fb8..66d63d70e0 100644
--- a/packages/docusaurus-plugin-pwa/src/theme/PwaReloadPopup/index.tsx
+++ b/packages/docusaurus-plugin-pwa/src/theme/PwaReloadPopup/index.tsx
@@ -8,7 +8,6 @@
 import React, {useState} from 'react';
 import clsx from 'clsx';
 import Translate, {translate} from '@docusaurus/Translate';
-
 import type {Props} from '@theme/PwaReloadPopup';
 
 import styles from './styles.module.css';
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
index c9008bd310..26fd096caf 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/createSitemap.test.ts
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import {EnumChangefreq} from 'sitemap';
 import createSitemap from '../createSitemap';
 import type {DocusaurusConfig} from '@docusaurus/types';
-import {EnumChangefreq} from 'sitemap';
 
 describe('createSitemap', () => {
   it('simple site', async () => {
diff --git a/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts b/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
index c581cbece0..8d57746125 100644
--- a/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
+++ b/packages/docusaurus-plugin-sitemap/src/__tests__/options.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {validateOptions, DEFAULT_OPTIONS, type Options} from '../options';
 import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import {validateOptions, DEFAULT_OPTIONS, type Options} from '../options';
 
 function testValidate(options: Options) {
   return validateOptions({validate: normalizePluginOptions, options});
diff --git a/packages/docusaurus-plugin-sitemap/src/createSitemap.ts b/packages/docusaurus-plugin-sitemap/src/createSitemap.ts
index 5e1b619d35..366714fd3f 100644
--- a/packages/docusaurus-plugin-sitemap/src/createSitemap.ts
+++ b/packages/docusaurus-plugin-sitemap/src/createSitemap.ts
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import type {ReactElement} from 'react';
 import {SitemapStream, streamToPromise} from 'sitemap';
 import {applyTrailingSlash} from '@docusaurus/utils-common';
 import {createMatcher} from '@docusaurus/utils';
 import type {DocusaurusConfig} from '@docusaurus/types';
 import type {HelmetServerState} from 'react-helmet-async';
 import type {PluginOptions} from './options';
-import type {ReactElement} from 'react';
 
 export default async function createSitemap(
   siteConfig: DocusaurusConfig,
diff --git a/packages/docusaurus-remark-plugin-npm2yarn/src/__tests__/index.test.ts b/packages/docusaurus-remark-plugin-npm2yarn/src/__tests__/index.test.ts
index 6c6dc300e1..2ed9613324 100644
--- a/packages/docusaurus-remark-plugin-npm2yarn/src/__tests__/index.test.ts
+++ b/packages/docusaurus-remark-plugin-npm2yarn/src/__tests__/index.test.ts
@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
+import vfile from 'to-vfile';
+import mdx from 'remark-mdx';
 import remark from 'remark';
 import npm2yarn from '../index';
-import vfile from 'to-vfile';
-import path from 'path';
-import mdx from 'remark-mdx';
 
 const processFixture = async (name: string, options?: {sync?: boolean}) => {
   const filePath = path.join(__dirname, '__fixtures__', `${name}.md`);
diff --git a/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts b/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts
index 0764763e95..28b4c7e891 100644
--- a/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts
+++ b/packages/docusaurus-remark-plugin-npm2yarn/src/index.ts
@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import visit from 'unist-util-visit';
+import npmToYarn from 'npm-to-yarn';
 import type {Code, Content, Literal} from 'mdast';
 import type {Plugin} from 'unified';
 import type {Node, Parent} from 'unist';
-import visit from 'unist-util-visit';
-import npmToYarn from 'npm-to-yarn';
 
 type PluginOptions = {
   sync?: boolean;
diff --git a/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts b/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts
index 1c530f978e..48a2c70f3f 100644
--- a/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts
+++ b/packages/docusaurus-theme-classic/src/__tests__/translations.test.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {updateTranslationFileMessages} from '@docusaurus/utils';
 import {getTranslationFiles, translateThemeConfig} from '../translations';
 import type {ThemeConfig} from '@docusaurus/theme-common';
-import {updateTranslationFileMessages} from '@docusaurus/utils';
 
 const ThemeConfigSample: ThemeConfig = {
   colorMode: {},
diff --git a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
index a4ca7e3460..8d85a4d376 100644
--- a/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
+++ b/packages/docusaurus-theme-classic/src/__tests__/validateThemeConfig.test.ts
@@ -6,11 +6,11 @@
  */
 
 import _ from 'lodash';
-import {ThemeConfigSchema, DEFAULT_CONFIG} from '../validateThemeConfig';
 
 import {normalizeThemeConfig} from '@docusaurus/utils-validation';
 import theme from 'prism-react-renderer/themes/github';
 import darkTheme from 'prism-react-renderer/themes/dracula';
+import {ThemeConfigSchema, DEFAULT_CONFIG} from '../validateThemeConfig';
 
 function testValidateThemeConfig(partialThemeConfig: {[key: string]: unknown}) {
   return normalizeThemeConfig(ThemeConfigSchema, {
diff --git a/packages/docusaurus-theme-classic/src/index.ts b/packages/docusaurus-theme-classic/src/index.ts
index ad0e4f09d6..286167f378 100644
--- a/packages/docusaurus-theme-classic/src/index.ts
+++ b/packages/docusaurus-theme-classic/src/index.ts
@@ -5,18 +5,18 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import type {CSSProperties} from 'react';
 import path from 'path';
-import type {LoadContext, Plugin} from '@docusaurus/types';
-import type {ThemeConfig} from '@docusaurus/theme-common';
-import {getTranslationFiles, translateThemeConfig} from './translations';
 import {createRequire} from 'module';
-import type {Plugin as PostCssPlugin} from 'postcss';
 import rtlcss from 'rtlcss';
 import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
+import {getTranslationFiles, translateThemeConfig} from './translations';
+import type {LoadContext, Plugin} from '@docusaurus/types';
+import type {ThemeConfig} from '@docusaurus/theme-common';
+import type {Plugin as PostCssPlugin} from 'postcss';
 import type {Options} from '@docusaurus/theme-classic';
 import type webpack from 'webpack';
 import type {PrismTheme} from 'prism-react-renderer';
-import type {CSSProperties} from 'react';
 
 const requireFromDocusaurusCore = createRequire(
   require.resolve('@docusaurus/core/package.json'),
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogArchivePage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogArchivePage/index.tsx
index a05afdf43f..763d0661e2 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogArchivePage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogArchivePage/index.tsx
@@ -6,11 +6,11 @@
  */
 
 import React from 'react';
-import Layout from '@theme/Layout';
 import Link from '@docusaurus/Link';
-import type {ArchiveBlogPost, Props} from '@theme/BlogArchivePage';
 import {translate} from '@docusaurus/Translate';
 import {PageMetadata} from '@docusaurus/theme-common';
+import Layout from '@theme/Layout';
+import type {ArchiveBlogPost, Props} from '@theme/BlogArchivePage';
 
 type YearProp = {
   year: string;
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx
index 910328b214..72270058d9 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogListPage/index.tsx
@@ -6,19 +6,19 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
 
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import BlogLayout from '@theme/BlogLayout';
-import BlogPostItem from '@theme/BlogPostItem';
-import BlogListPaginator from '@theme/BlogListPaginator';
-import type {Props} from '@theme/BlogListPage';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
+import BlogLayout from '@theme/BlogLayout';
+import BlogPostItem from '@theme/BlogPostItem';
+import BlogListPaginator from '@theme/BlogListPaginator';
 import SearchMetadata from '@theme/SearchMetadata';
-import clsx from 'clsx';
+import type {Props} from '@theme/BlogListPage';
 
 function BlogListPageMetadata(props: Props): JSX.Element {
   const {metadata} = props;
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostAuthors/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostAuthors/index.tsx
index 4e36a71425..99386d4ae9 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostAuthors/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostAuthors/index.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import type {Props} from '@theme/BlogPostAuthors';
 import BlogPostAuthor from '@theme/BlogPostAuthor';
+import type {Props} from '@theme/BlogPostAuthors';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
index e531b8e985..b0fcad3236 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostItem/index.tsx
@@ -14,11 +14,11 @@ import {usePluralForm} from '@docusaurus/theme-common';
 import {blogPostContainerID} from '@docusaurus/utils-common';
 import MDXContent from '@theme/MDXContent';
 import EditThisPage from '@theme/EditThisPage';
+import TagsListInline from '@theme/TagsListInline';
+import BlogPostAuthors from '@theme/BlogPostAuthors';
 import type {Props} from '@theme/BlogPostItem';
 
 import styles from './styles.module.css';
-import TagsListInline from '@theme/TagsListInline';
-import BlogPostAuthors from '@theme/BlogPostAuthors';
 
 // Very simple pluralization: probably good enough for now
 function useReadingTimePlural() {
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
index c7b9ec88e5..3d47fc4dd3 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPage/index.tsx
@@ -6,17 +6,17 @@
  */
 
 import React from 'react';
-import BlogLayout from '@theme/BlogLayout';
-import BlogPostItem from '@theme/BlogPostItem';
-import BlogPostPaginator from '@theme/BlogPostPaginator';
-import type {Props} from '@theme/BlogPostPage';
+import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
+import BlogLayout from '@theme/BlogLayout';
+import BlogPostItem from '@theme/BlogPostItem';
+import BlogPostPaginator from '@theme/BlogPostPaginator';
 import TOC from '@theme/TOC';
-import clsx from 'clsx';
+import type {Props} from '@theme/BlogPostPage';
 
 function BlogPostPageMetadata(props: Props): JSX.Element {
   const {content: BlogPostContents} = props;
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogSidebar/Desktop/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogSidebar/Desktop/index.tsx
index ff74637e9e..f010d21448 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogSidebar/Desktop/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogSidebar/Desktop/index.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 import clsx from 'clsx';
 import Link from '@docusaurus/Link';
 import {translate} from '@docusaurus/Translate';
+import type {Props} from '@theme/BlogSidebar/Desktop';
 
 import styles from './styles.module.css';
-import type {Props} from '@theme/BlogSidebar/Desktop';
 
 export default function BlogSidebarDesktop({sidebar}: Props): JSX.Element {
   return (
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogSidebar/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogSidebar/index.tsx
index 742f4bd427..f8458777ef 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogSidebar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogSidebar/index.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import {useWindowSize} from '@docusaurus/theme-common';
 import BlogSidebarDesktop from '@theme/BlogSidebar/Desktop';
 import BlogSidebarMobile from '@theme/BlogSidebar/Mobile';
-import {useWindowSize} from '@docusaurus/theme-common';
 import type {Props} from '@theme/BlogSidebar';
 
 export default function BlogSidebar({sidebar}: Props): JSX.Element | null {
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx
index 2f53b6ee41..017329d478 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsListPage/index.tsx
@@ -6,18 +6,17 @@
  */
 
 import React from 'react';
-
-import BlogLayout from '@theme/BlogLayout';
-import TagsListByLetter from '@theme/TagsListByLetter';
-import type {Props} from '@theme/BlogTagsListPage';
+import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
   translateTagsPageTitle,
 } from '@docusaurus/theme-common';
+import BlogLayout from '@theme/BlogLayout';
+import TagsListByLetter from '@theme/TagsListByLetter';
+import type {Props} from '@theme/BlogTagsListPage';
 import SearchMetadata from '../SearchMetadata';
-import clsx from 'clsx';
 
 export default function BlogTagsListPage({tags, sidebar}: Props): JSX.Element {
   const title = translateTagsPageTitle();
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx
index fddda0795d..312bc945e1 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/BlogTagsPostsPage/index.tsx
@@ -6,11 +6,7 @@
  */
 
 import React from 'react';
-
-import Link from '@docusaurus/Link';
-import BlogLayout from '@theme/BlogLayout';
-import BlogPostItem from '@theme/BlogPostItem';
-import type {Props} from '@theme/BlogTagsPostsPage';
+import clsx from 'clsx';
 import Translate, {translate} from '@docusaurus/Translate';
 import {
   PageMetadata,
@@ -18,9 +14,12 @@ import {
   ThemeClassNames,
   usePluralForm,
 } from '@docusaurus/theme-common';
+import Link from '@docusaurus/Link';
+import BlogLayout from '@theme/BlogLayout';
+import BlogPostItem from '@theme/BlogPostItem';
 import BlogListPaginator from '@theme/BlogListPaginator';
 import SearchMetadata from '@theme/SearchMetadata';
-import clsx from 'clsx';
+import type {Props} from '@theme/BlogTagsPostsPage';
 
 // Very simple pluralization: probably good enough for now
 function useBlogPostsPlural() {
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/Element.tsx b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/Element.tsx
index 3f130e80e6..a31cd85731 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/Element.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/Element.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import Container from '@theme/CodeBlock/Container';
 import clsx from 'clsx';
+import Container from '@theme/CodeBlock/Container';
 import type {Props} from '@theme/CodeBlock/Content/Element';
 
 import styles from './styles.module.css';
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 f73819a37f..5a9384f7b6 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/String.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Content/String.tsx
@@ -6,6 +6,7 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
 import {
   useThemeConfig,
   parseCodeBlockTitle,
@@ -15,7 +16,6 @@ import {
   usePrismTheme,
   useCodeWordWrap,
 } from '@docusaurus/theme-common';
-import clsx from 'clsx';
 import Highlight, {defaultProps, type Language} from 'prism-react-renderer';
 import Line from '@theme/CodeBlock/Line';
 import CopyButton from '@theme/CodeBlock/CopyButton';
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Line/index.tsx b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Line/index.tsx
index 99d4c5681d..3fc0f6f076 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/Line/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/Line/index.tsx
@@ -7,9 +7,10 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import type {Props} from '@theme/CodeBlock/Line';
-import styles from './styles.module.css';
 import useIsBrowser from '@docusaurus/useIsBrowser';
+import type {Props} from '@theme/CodeBlock/Line';
+
+import styles from './styles.module.css';
 
 export default function CodeBlockLine({
   line,
diff --git a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
index 8df9a52bb2..5017a1cf5a 100644
--- a/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/CodeBlock/index.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, {isValidElement, type ReactNode} from 'react';
-import type {Props} from '@theme/CodeBlock';
 import ElementContent from '@theme/CodeBlock/Content/Element';
 import StringContent from '@theme/CodeBlock/Content/String';
+import type {Props} from '@theme/CodeBlock';
 
 /**
  * Best attempt to make the children a plain string so it is copyable. If there
diff --git a/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx b/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx
index e119f2ae33..2b0407a547 100644
--- a/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/ColorModeToggle/index.tsx
@@ -6,13 +6,13 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/ColorModeToggle';
+import clsx from 'clsx';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import {translate} from '@docusaurus/Translate';
 import IconLightMode from '@theme/IconLightMode';
 import IconDarkMode from '@theme/IconDarkMode';
+import type {Props} from '@theme/ColorModeToggle';
 
-import clsx from 'clsx';
 import styles from './styles.module.css';
 
 function ColorModeToggle({className, value, onChange}: Props): JSX.Element {
diff --git a/packages/docusaurus-theme-classic/src/theme/Details/index.tsx b/packages/docusaurus-theme-classic/src/theme/Details/index.tsx
index 1887293514..b6e7b06f6b 100644
--- a/packages/docusaurus-theme-classic/src/theme/Details/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Details/index.tsx
@@ -9,6 +9,7 @@ import React from 'react';
 import clsx from 'clsx';
 import {Details as DetailsGeneric} from '@docusaurus/theme-common/Details';
 import type {Props} from '@theme/Details';
+
 import styles from './styles.module.css';
 
 // Should we have a custom details/summary comp in Infima instead of reusing
diff --git a/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx
index 0ed00dc1f4..44200b2f32 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocBreadcrumbs/index.tsx
@@ -6,18 +6,19 @@
  */
 
 import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
 import {
   ThemeClassNames,
   useSidebarBreadcrumbs,
   useHomePageRoute,
 } from '@docusaurus/theme-common';
-import styles from './styles.module.css';
-import clsx from 'clsx';
 import Link from '@docusaurus/Link';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import {translate} from '@docusaurus/Translate';
 import IconHome from '@theme/IconHome';
 
+import styles from './styles.module.css';
+
 // TODO move to design system folder
 function BreadcrumbsItemLink({
   children,
diff --git a/packages/docusaurus-theme-classic/src/theme/DocCard/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocCard/index.tsx
index 15c8ac155d..fc63f1949f 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocCard/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocCard/index.tsx
@@ -6,17 +6,18 @@
  */
 
 import React, {type ReactNode} from 'react';
+import clsx from 'clsx';
 import Link from '@docusaurus/Link';
+import {findFirstCategoryLink, useDocById} from '@docusaurus/theme-common';
+import isInternalUrl from '@docusaurus/isInternalUrl';
+import {translate} from '@docusaurus/Translate';
+import type {Props} from '@theme/DocCard';
+
+import styles from './styles.module.css';
 import type {
   PropSidebarItemCategory,
   PropSidebarItemLink,
 } from '@docusaurus/plugin-content-docs';
-import type {Props} from '@theme/DocCard';
-import {findFirstCategoryLink, useDocById} from '@docusaurus/theme-common';
-import clsx from 'clsx';
-import styles from './styles.module.css';
-import isInternalUrl from '@docusaurus/isInternalUrl';
-import {translate} from '@docusaurus/Translate';
 
 function CardContainer({
   href,
diff --git a/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx
index d2e61b8037..3c105378ae 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocCardList/index.tsx
@@ -7,11 +7,10 @@
 
 import React from 'react';
 import clsx from 'clsx';
-
-import DocCard from '@theme/DocCard';
-import type {PropSidebarItem} from '@docusaurus/plugin-content-docs';
 import {findFirstCategoryLink} from '@docusaurus/theme-common';
+import DocCard from '@theme/DocCard';
 import type {Props} from '@theme/DocCardList';
+import type {PropSidebarItem} from '@docusaurus/plugin-content-docs';
 
 // Filter categories that don't have a link.
 function filterItems(items: PropSidebarItem[]): PropSidebarItem[] {
diff --git a/packages/docusaurus-theme-classic/src/theme/DocCategoryGeneratedIndexPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocCategoryGeneratedIndexPage/index.tsx
index a1b183f170..0058b71596 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocCategoryGeneratedIndexPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocCategoryGeneratedIndexPage/index.tsx
@@ -10,14 +10,14 @@ import {
   PageMetadata,
   useCurrentSidebarCategory,
 } from '@docusaurus/theme-common';
-import type {Props} from '@theme/DocCategoryGeneratedIndexPage';
+import useBaseUrl from '@docusaurus/useBaseUrl';
 import DocCardList from '@theme/DocCardList';
 import DocPaginator from '@theme/DocPaginator';
 import DocVersionBanner from '@theme/DocVersionBanner';
 import DocVersionBadge from '@theme/DocVersionBadge';
 import DocBreadcrumbs from '@theme/DocBreadcrumbs';
 import Heading from '@theme/Heading';
-import useBaseUrl from '@docusaurus/useBaseUrl';
+import type {Props} from '@theme/DocCategoryGeneratedIndexPage';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx
index 77265efccb..fa75f1c162 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocItem/index.tsx
@@ -7,23 +7,24 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import DocPaginator from '@theme/DocPaginator';
-import DocVersionBanner from '@theme/DocVersionBanner';
-import DocVersionBadge from '@theme/DocVersionBadge';
-import type {Props} from '@theme/DocItem';
-import DocItemFooter from '@theme/DocItemFooter';
-import TOC from '@theme/TOC';
-import TOCCollapsible from '@theme/TOCCollapsible';
-import Heading from '@theme/Heading';
-import styles from './styles.module.css';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
   useWindowSize,
 } from '@docusaurus/theme-common';
+import DocPaginator from '@theme/DocPaginator';
+import DocVersionBanner from '@theme/DocVersionBanner';
+import DocVersionBadge from '@theme/DocVersionBadge';
+import DocItemFooter from '@theme/DocItemFooter';
+import TOC from '@theme/TOC';
+import TOCCollapsible from '@theme/TOCCollapsible';
+import Heading from '@theme/Heading';
 import DocBreadcrumbs from '@theme/DocBreadcrumbs';
 import MDXContent from '@theme/MDXContent';
+import type {Props} from '@theme/DocItem';
+
+import styles from './styles.module.css';
 
 function DocItemMetadata(props: Props): JSX.Element {
   const {content: DocContent} = props;
diff --git a/packages/docusaurus-theme-classic/src/theme/DocItemFooter/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocItemFooter/index.tsx
index 056391687c..c6f998cb61 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocItemFooter/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocItemFooter/index.tsx
@@ -7,16 +7,15 @@
 
 import React from 'react';
 import clsx from 'clsx';
-
+import {ThemeClassNames} from '@docusaurus/theme-common';
 import LastUpdated from '@theme/LastUpdated';
-import type {Props} from '@theme/DocItem';
 import EditThisPage from '@theme/EditThisPage';
 import TagsListInline, {
   type Props as TagsListInlineProps,
 } from '@theme/TagsListInline';
+import type {Props} from '@theme/DocItem';
 
 import styles from './styles.module.css';
-import {ThemeClassNames} from '@docusaurus/theme-common';
 
 function TagsRow(props: TagsListInlineProps) {
   return (
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Main/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Main/index.tsx
index 3cc4f0479e..61ccdafdb6 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Main/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Main/index.tsx
@@ -6,13 +6,12 @@
  */
 
 import React from 'react';
-
-import {useDocsSidebar} from '@docusaurus/theme-common';
-
 import clsx from 'clsx';
-import styles from './styles.module.css';
+import {useDocsSidebar} from '@docusaurus/theme-common';
 import type {Props} from '@theme/DocPage/Layout/Main';
 
+import styles from './styles.module.css';
+
 export default function DocPageLayoutMain({
   hiddenSidebarContainer,
   children,
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx
index 7d68031577..0cf8896393 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/ExpandButton/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import IconArrow from '@theme/IconArrow';
 import {translate} from '@docusaurus/Translate';
+import IconArrow from '@theme/IconArrow';
 import type {Props} from '@theme/DocPage/Layout/Sidebar/ExpandButton';
 
 import styles from './styles.module.css';
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/index.tsx
index 438d9f814e..150fd888a3 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/index.tsx
@@ -6,15 +6,14 @@
  */
 
 import React, {type ReactNode, useState, useCallback} from 'react';
-import DocSidebar from '@theme/DocSidebar';
-import {useLocation} from '@docusaurus/router';
-import type {Props} from '@theme/DocPage/Layout/Sidebar';
-import ExpandButton from '@theme/DocPage/Layout/Sidebar/ExpandButton';
-
 import clsx from 'clsx';
-import styles from './index.module.css';
-
 import {ThemeClassNames, useDocsSidebar} from '@docusaurus/theme-common';
+import {useLocation} from '@docusaurus/router';
+import DocSidebar from '@theme/DocSidebar';
+import ExpandButton from '@theme/DocPage/Layout/Sidebar/ExpandButton';
+import type {Props} from '@theme/DocPage/Layout/Sidebar';
+
+import styles from './styles.module.css';
 
 // Reset sidebar state when sidebar changes
 // Use React key to unmount/remount the children
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/index.module.css b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/index.module.css
rename to packages/docusaurus-theme-classic/src/theme/DocPage/Layout/Sidebar/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/index.tsx
index 8f95807481..d5a48c1a68 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/index.tsx
@@ -6,15 +6,14 @@
  */
 
 import React, {useState} from 'react';
+import {useDocsSidebar} from '@docusaurus/theme-common';
 import Layout from '@theme/Layout';
 import BackToTopButton from '@theme/BackToTopButton';
-import type {Props} from '@theme/DocPage/Layout';
 import DocPageLayoutSidebar from '@theme/DocPage/Layout/Sidebar';
 import DocPageLayoutMain from '@theme/DocPage/Layout/Main';
+import type {Props} from '@theme/DocPage/Layout';
 
-import styles from './index.module.css';
-
-import {useDocsSidebar} from '@docusaurus/theme-common';
+import styles from './styles.module.css';
 
 export default function DocPageLayout({children}: Props): JSX.Element {
   const sidebar = useDocsSidebar();
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/index.module.css b/packages/docusaurus-theme-classic/src/theme/DocPage/Layout/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/DocPage/Layout/index.module.css
rename to packages/docusaurus-theme-classic/src/theme/DocPage/Layout/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
index b1404be798..3e45dbbda3 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocPage/index.tsx
@@ -6,12 +6,7 @@
  */
 
 import React from 'react';
-import NotFound from '@theme/NotFound';
-import type {Props} from '@theme/DocPage';
-import DocPageLayout from '@theme/DocPage/Layout';
-
 import clsx from 'clsx';
-
 import {
   HtmlClassNameProvider,
   ThemeClassNames,
@@ -20,7 +15,10 @@ import {
   DocsVersionProvider,
   useDocRouteMetadata,
 } from '@docusaurus/theme-common';
+import DocPageLayout from '@theme/DocPage/Layout';
+import NotFound from '@theme/NotFound';
 import SearchMetadata from '@theme/SearchMetadata';
+import type {Props} from '@theme/DocPage';
 
 export default function DocPage(props: Props): JSX.Element {
   const {versionMetadata} = props;
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx
index c902ac90d6..f5d96d1648 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebar/Desktop/CollapseButton/index.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import IconArrow from '@theme/IconArrow';
 import {translate} from '@docusaurus/Translate';
+import IconArrow from '@theme/IconArrow';
 import type {Props} from '@theme/DocSidebar/Desktop/CollapseButton';
 
 import styles from './styles.module.css';
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx
index 5bbd9e2eb7..f057073d60 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebar/index.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import {useWindowSize} from '@docusaurus/theme-common';
-import type {Props} from '@theme/DocSidebar';
 import DocSidebarDesktop from '@theme/DocSidebar/Desktop';
 import DocSidebarMobile from '@theme/DocSidebar/Mobile';
+import type {Props} from '@theme/DocSidebar';
 
 export default function DocSidebar(props: Props): JSX.Element {
   const windowSize = useWindowSize();
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
similarity index 94%
rename from packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category.tsx
rename to packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
index 7a9a52e0e8..18047a9225 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Category/index.tsx
@@ -20,30 +20,28 @@ import {
 } from '@docusaurus/theme-common';
 import Link from '@docusaurus/Link';
 import {translate} from '@docusaurus/Translate';
-
+import useIsBrowser from '@docusaurus/useIsBrowser';
 import DocSidebarItems from '@theme/DocSidebarItems';
 import type {Props} from '@theme/DocSidebarItem/Category';
 
-import useIsBrowser from '@docusaurus/useIsBrowser';
-
 // If we navigate to a category and it becomes active, it should automatically
 // expand itself
 function useAutoExpandActiveCategory({
   isActive,
   collapsed,
-  setCollapsed,
+  updateCollapsed,
 }: {
   isActive: boolean;
   collapsed: boolean;
-  setCollapsed: (b: boolean) => void;
+  updateCollapsed: (b: boolean) => void;
 }) {
   const wasActive = usePrevious(isActive);
   useEffect(() => {
     const justBecameActive = isActive && !wasActive;
     if (justBecameActive && collapsed) {
-      setCollapsed(false);
+      updateCollapsed(false);
     }
-  }, [isActive, wasActive, collapsed, setCollapsed]);
+  }, [isActive, wasActive, collapsed, updateCollapsed]);
 }
 
 /**
@@ -105,6 +103,11 @@ export default function DocSidebarItemCategory({
   ...props
 }: Props): JSX.Element {
   const {items, label, collapsible, className, href} = item;
+  const {
+    docs: {
+      sidebar: {autoCollapseCategories},
+    },
+  } = useThemeConfig();
   const hrefWithSSRFallback = useCategoryHrefWithSSRFallback(item);
 
   const isActive = isActiveSidebarItem(item, activePath);
@@ -121,17 +124,13 @@ export default function DocSidebarItemCategory({
     },
   });
 
-  useAutoExpandActiveCategory({isActive, collapsed, setCollapsed});
   const {expandedItem, setExpandedItem} = useDocSidebarItemsExpandedState();
-  function updateCollapsed(toCollapsed: boolean = !collapsed) {
+  // Use this instead of `setCollapsed`, because it is also reactive
+  const updateCollapsed = (toCollapsed: boolean = !collapsed) => {
     setExpandedItem(toCollapsed ? null : index);
     setCollapsed(toCollapsed);
-  }
-  const {
-    docs: {
-      sidebar: {autoCollapseCategories},
-    },
-  } = useThemeConfig();
+  };
+  useAutoExpandActiveCategory({isActive, collapsed, updateCollapsed});
   useEffect(() => {
     if (
       collapsible &&
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx
similarity index 95%
rename from packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html.tsx
rename to packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx
index 0e97ec2778..7f6bab8f6c 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/index.tsx
@@ -10,7 +10,7 @@ import clsx from 'clsx';
 import {ThemeClassNames} from '@docusaurus/theme-common';
 import type {Props} from '@theme/DocSidebarItem/Html';
 
-import styles from './Html.module.css';
+import styles from './styles.module.css';
 
 export default function DocSidebarItemHtml({
   item,
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html.module.css b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html.module.css
rename to packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Html/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx
similarity index 97%
rename from packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link.tsx
rename to packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx
index 28c481eed4..fc87268e01 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/index.tsx
@@ -11,10 +11,9 @@ import {isActiveSidebarItem, ThemeClassNames} from '@docusaurus/theme-common';
 import Link from '@docusaurus/Link';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import IconExternalLink from '@theme/IconExternalLink';
-
 import type {Props} from '@theme/DocSidebarItem/Link';
 
-import styles from './Link.module.css';
+import styles from './styles.module.css';
 
 export default function DocSidebarItemLink({
   item,
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link.module.css b/packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link.module.css
rename to packages/docusaurus-theme-classic/src/theme/DocSidebarItem/Link/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/DocSidebarItems/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocSidebarItems/index.tsx
index fbced08e14..041c553f28 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocSidebarItems/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocSidebarItems/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, {memo} from 'react';
-import DocSidebarItem from '@theme/DocSidebarItem';
 import {DocSidebarItemsExpandedStateProvider} from '@docusaurus/theme-common';
+import DocSidebarItem from '@theme/DocSidebarItem';
 
 import type {Props} from '@theme/DocSidebarItems';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/DocTagDocListPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocTagDocListPage/index.tsx
index 22cf3ff7ac..a928644a9b 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocTagDocListPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocTagDocListPage/index.tsx
@@ -6,8 +6,7 @@
  */
 
 import React from 'react';
-
-import Layout from '@theme/Layout';
+import clsx from 'clsx';
 import Link from '@docusaurus/Link';
 import {
   PageMetadata,
@@ -16,9 +15,9 @@ import {
   usePluralForm,
 } from '@docusaurus/theme-common';
 import Translate, {translate} from '@docusaurus/Translate';
-import type {Props} from '@theme/DocTagDocListPage';
+import Layout from '@theme/Layout';
 import SearchMetadata from '@theme/SearchMetadata';
-import clsx from 'clsx';
+import type {Props} from '@theme/DocTagDocListPage';
 
 // Very simple pluralization: probably good enough for now
 function useNDocsTaggedPlural() {
diff --git a/packages/docusaurus-theme-classic/src/theme/DocTagsListPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocTagsListPage/index.tsx
index 5ab4f5a44d..e848128fed 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocTagsListPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocTagsListPage/index.tsx
@@ -6,18 +6,17 @@
  */
 
 import React from 'react';
-
-import Layout from '@theme/Layout';
+import clsx from 'clsx';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
   translateTagsPageTitle,
 } from '@docusaurus/theme-common';
+import Layout from '@theme/Layout';
 import TagsListByLetter from '@theme/TagsListByLetter';
-import type {Props} from '@theme/DocTagsListPage';
 import SearchMetadata from '@theme/SearchMetadata';
-import clsx from 'clsx';
+import type {Props} from '@theme/DocTagsListPage';
 
 export default function DocTagsListPage({tags}: Props): JSX.Element {
   const title = translateTagsPageTitle();
diff --git a/packages/docusaurus-theme-classic/src/theme/DocVersionBadge/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocVersionBadge/index.tsx
index 862a33e5e5..dc4a2c90bb 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocVersionBadge/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocVersionBadge/index.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
 import {ThemeClassNames, useDocsVersion} from '@docusaurus/theme-common';
-import clsx from 'clsx';
 import type {Props} from '@theme/DocVersionBadge';
 
 export default function DocVersionBadge({
diff --git a/packages/docusaurus-theme-classic/src/theme/DocVersionBanner/index.tsx b/packages/docusaurus-theme-classic/src/theme/DocVersionBanner/index.tsx
index dd87a4d367..979a4f2b90 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocVersionBanner/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/DocVersionBanner/index.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, {type ComponentType} from 'react';
+import clsx from 'clsx';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Link from '@docusaurus/Link';
 import Translate from '@docusaurus/Translate';
@@ -21,7 +22,6 @@ import {
 } from '@docusaurus/theme-common';
 
 import type {Props} from '@theme/DocVersionBanner';
-import clsx from 'clsx';
 import type {
   VersionBanner,
   PropVersionMetadata,
diff --git a/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx
index 5fda42f876..f4b5518775 100644
--- a/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/EditThisPage/index.tsx
@@ -7,10 +7,9 @@
 
 import React from 'react';
 import Translate from '@docusaurus/Translate';
-
-import type {Props} from '@theme/EditThisPage';
-import IconEdit from '@theme/IconEdit';
 import {ThemeClassNames} from '@docusaurus/theme-common';
+import IconEdit from '@theme/IconEdit';
+import type {Props} from '@theme/EditThisPage';
 
 export default function EditThisPage({editUrl}: Props): JSX.Element {
   return (
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 a2bad28d86..01b362e520 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
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/Footer/Links/MultiColumn';
 import LinkItem from '@theme/Footer/LinkItem';
+import type {Props} from '@theme/Footer/Links/MultiColumn';
 
 type ColumnType = Props['columns'][number];
 type ColumnItemType = ColumnType['items'][number];
diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/Links/Simple/index.tsx b/packages/docusaurus-theme-classic/src/theme/Footer/Links/Simple/index.tsx
index 72fcc0a74a..e14b77f1f3 100644
--- a/packages/docusaurus-theme-classic/src/theme/Footer/Links/Simple/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Footer/Links/Simple/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/Footer/Links/Simple';
 import LinkItem from '@theme/Footer/LinkItem';
+import type {Props} from '@theme/Footer/Links/Simple';
 
 function Separator() {
   return <span className="footer__link-separator">·</span>;
diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/Links/index.tsx b/packages/docusaurus-theme-classic/src/theme/Footer/Links/index.tsx
index 44e553e539..a4b0f3354c 100644
--- a/packages/docusaurus-theme-classic/src/theme/Footer/Links/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Footer/Links/index.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 
 import {isMultiColumnFooterLinks} from '@docusaurus/theme-common';
-import type {Props} from '@theme/Footer/Links';
 import FooterLinksMultiColumn from '@theme/Footer/Links/MultiColumn';
 import FooterLinksSimple from '@theme/Footer/Links/Simple';
+import type {Props} from '@theme/Footer/Links';
 
 export default function FooterLinks({links}: Props): JSX.Element {
   return isMultiColumnFooterLinks(links) ? (
diff --git a/packages/docusaurus-theme-classic/src/theme/Footer/Logo/index.tsx b/packages/docusaurus-theme-classic/src/theme/Footer/Logo/index.tsx
index f566555a17..121e08f758 100644
--- a/packages/docusaurus-theme-classic/src/theme/Footer/Logo/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Footer/Logo/index.tsx
@@ -6,13 +6,13 @@
  */
 
 import React from 'react';
-
 import Link from '@docusaurus/Link';
 import {useBaseUrlUtils} from '@docusaurus/useBaseUrl';
-import styles from './styles.module.css';
 import ThemedImage from '@theme/ThemedImage';
 import type {Props} from '@theme/Footer/Logo';
 
+import styles from './styles.module.css';
+
 function LogoImage({logo}: Props) {
   const {withBaseUrl} = useBaseUrlUtils();
   const sources = {
diff --git a/packages/docusaurus-theme-classic/src/theme/Heading/index.tsx b/packages/docusaurus-theme-classic/src/theme/Heading/index.tsx
index 7f8f808764..9969fdbb6e 100644
--- a/packages/docusaurus-theme-classic/src/theme/Heading/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Heading/index.tsx
@@ -7,9 +7,9 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import type {Props} from '@theme/Heading';
 import {translate} from '@docusaurus/Translate';
 import {useThemeConfig} from '@docusaurus/theme-common';
+import type {Props} from '@theme/Heading';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx b/packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx
index 76f8a8168b..004c122165 100644
--- a/packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/IconEdit/index.tsx
@@ -7,7 +7,6 @@
 
 import React from 'react';
 import clsx from 'clsx';
-
 import type {Props} from '@theme/IconEdit';
 
 import styles from './styles.module.css';
diff --git a/packages/docusaurus-theme-classic/src/theme/LastUpdated/index.tsx b/packages/docusaurus-theme-classic/src/theme/LastUpdated/index.tsx
index 5793721628..5ba4c3e2f2 100644
--- a/packages/docusaurus-theme-classic/src/theme/LastUpdated/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/LastUpdated/index.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import Translate from '@docusaurus/Translate';
-import type {Props} from '@theme/LastUpdated';
 import {ThemeClassNames} from '@docusaurus/theme-common';
+import type {Props} from '@theme/LastUpdated';
 
 function LastUpdatedAtDate({
   lastUpdatedAt,
diff --git a/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx b/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx
index 47ed451b55..c5503edcaa 100644
--- a/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Layout/index.tsx
@@ -8,19 +8,19 @@
 import React from 'react';
 import clsx from 'clsx';
 import ErrorBoundary from '@docusaurus/ErrorBoundary';
-import SkipToContent from '@theme/SkipToContent';
-import AnnouncementBar from '@theme/AnnouncementBar';
-import Navbar from '@theme/Navbar';
-import Footer from '@theme/Footer';
-import LayoutProviders from '@theme/LayoutProviders';
-import type {Props} from '@theme/Layout';
 import {
   PageMetadata,
   ThemeClassNames,
   useKeyboardNavigation,
 } from '@docusaurus/theme-common';
+import SkipToContent from '@theme/SkipToContent';
+import AnnouncementBar from '@theme/AnnouncementBar';
+import Navbar from '@theme/Navbar';
+import Footer from '@theme/Footer';
+import LayoutProviders from '@theme/LayoutProviders';
 import ErrorPageContent from '@theme/ErrorPageContent';
 import './styles.css';
+import type {Props} from '@theme/Layout';
 
 export default function Layout(props: Props): JSX.Element {
   const {
diff --git a/packages/docusaurus-theme-classic/src/theme/Logo/index.tsx b/packages/docusaurus-theme-classic/src/theme/Logo/index.tsx
index eaa89cc1e0..13f4126198 100644
--- a/packages/docusaurus-theme-classic/src/theme/Logo/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Logo/index.tsx
@@ -6,13 +6,12 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/Logo';
-
 import Link from '@docusaurus/Link';
-import ThemedImage from '@theme/ThemedImage';
 import useBaseUrl from '@docusaurus/useBaseUrl';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import {useThemeConfig} from '@docusaurus/theme-common';
+import ThemedImage from '@theme/ThemedImage';
+import type {Props} from '@theme/Logo';
 
 export default function Logo(props: Props): JSX.Element {
   const {
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Img.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Img/index.tsx
similarity index 93%
rename from packages/docusaurus-theme-classic/src/theme/MDXComponents/Img.tsx
rename to packages/docusaurus-theme-classic/src/theme/MDXComponents/Img/index.tsx
index a97bedc3e0..c3b76dee9f 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Img.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Img/index.tsx
@@ -6,9 +6,10 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/MDXComponents/Img';
-import styles from './Img.module.css';
 import clsx from 'clsx';
+import type {Props} from '@theme/MDXComponents/Img';
+
+import styles from './styles.module.css';
 
 function transformImgClassName(className?: string): string {
   return clsx(className, styles.img);
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Img.module.css b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Img/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/MDXComponents/Img.module.css
rename to packages/docusaurus-theme-classic/src/theme/MDXComponents/Img/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx
index 8a0da274ec..080ecaac2a 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXComponents/Ul.tsx
@@ -12,8 +12,8 @@ import type {Props} from '@theme/MDXComponents/Ul';
 function transformUlClassName(className?: string): string {
   return clsx(
     className,
-    // This class is set globally by GitHub/MDX
-    // We keep the global class, but add Infima class to get list without styling
+    // This class is set globally by GitHub/MDX. We keep the global class, and
+    // add another Infima class to get list without styling
     // See https://github.com/syntax-tree/mdast-util-to-hast/issues/28
     className?.includes('contains-task-list') && 'clean-list',
   );
diff --git a/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx b/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx
index 44ba2a5c0f..64bb180a56 100644
--- a/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/MDXPage/index.tsx
@@ -7,15 +7,15 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import Layout from '@theme/Layout';
-import MDXContent from '@theme/MDXContent';
-import type {Props} from '@theme/MDXPage';
-import TOC from '@theme/TOC';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
+import Layout from '@theme/Layout';
+import MDXContent from '@theme/MDXContent';
+import TOC from '@theme/TOC';
+import type {Props} from '@theme/MDXPage';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/ColorModeToggle/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/ColorModeToggle/index.tsx
index 5c33ac4a3b..d1fc9c3ffb 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/ColorModeToggle/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/ColorModeToggle/index.tsx
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import React from 'react';
 import {useColorMode, useThemeConfig} from '@docusaurus/theme-common';
 import ColorModeToggle from '@theme/ColorModeToggle';
 import type {Props} from '@theme/Navbar/ColorModeToggle';
-import React from 'react';
 
 export default function NavbarColorModeToggle({
   className,
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 9ab92085ec..89503a675d 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Content/index.tsx
@@ -6,18 +6,19 @@
  */
 
 import React, {type ReactNode} from 'react';
-import type {Props as NavbarItemConfig} from '@theme/NavbarItem';
-import NavbarItem from '@theme/NavbarItem';
-import NavbarColorModeToggle from '@theme/Navbar/ColorModeToggle';
-import SearchBar from '@theme/SearchBar';
 import {
   splitNavbarItems,
   useNavbarMobileSidebar,
   useThemeConfig,
 } from '@docusaurus/theme-common';
+import NavbarItem 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';
 
 function useNavbarItems() {
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/Layout/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/Layout/index.tsx
index 00e5736bd8..b674fe7269 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/Layout/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/Layout/index.tsx
@@ -7,13 +7,13 @@
 
 import React, {type ComponentProps} from 'react';
 import clsx from 'clsx';
-import NavbarMobileSidebar from '@theme/Navbar/MobileSidebar';
-import type {Props} from '@theme/Navbar/Layout';
 import {
   useThemeConfig,
   useHideableNavbar,
   useNavbarMobileSidebar,
 } from '@docusaurus/theme-common';
+import NavbarMobileSidebar from '@theme/Navbar/MobileSidebar';
+import type {Props} from '@theme/Navbar/Layout';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx
index c58b42eb01..1393771153 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Header/index.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
+import {useNavbarMobileSidebar} from '@docusaurus/theme-common';
 import NavbarColorModeToggle from '@theme/Navbar/ColorModeToggle';
 import IconClose from '@theme/IconClose';
 import NavbarLogo from '@theme/Navbar/Logo';
-import {useNavbarMobileSidebar} from '@docusaurus/theme-common';
 
 function CloseButton() {
   const mobileSidebar = useNavbarMobileSidebar();
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Layout/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Layout/index.tsx
index 4fe7a4f998..6d63029dbd 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Layout/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Layout/index.tsx
@@ -7,8 +7,8 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import type {Props} from '@theme/Navbar/MobileSidebar/Layout';
 import {useNavbarSecondaryMenu} from '@docusaurus/theme-common';
+import type {Props} from '@theme/Navbar/MobileSidebar/Layout';
 
 export default function NavbarMobileSidebarLayout({
   header,
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 dbde63edb5..d8fa6524a6 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,8 @@
 
 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 from '../../../NavbarItem';
 
 function useNavbarItems() {
   // TODO temporary casting until ThemeConfig type is improved
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx
index e4ac62a505..6ac64154d3 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/Toggle/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import IconMenu from '@theme/IconMenu';
 import {useNavbarMobileSidebar} from '@docusaurus/theme-common';
+import IconMenu from '@theme/IconMenu';
 
 export default function MobileSidebarToggle(): JSX.Element {
   const mobileSidebar = useNavbarMobileSidebar();
diff --git a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/index.tsx b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/index.tsx
index 4a29c49015..4ee13c284e 100644
--- a/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Navbar/MobileSidebar/index.tsx
@@ -6,12 +6,12 @@
  */
 
 import React from 'react';
-import NavbarMobileSidebarLayout from '@theme/Navbar/MobileSidebar/Layout';
-import NavbarMobileSidebarHeader from '@theme/Navbar/MobileSidebar/Header';
 import {
   useLockBodyScroll,
   useNavbarMobileSidebar,
 } from '@docusaurus/theme-common';
+import NavbarMobileSidebarLayout from '@theme/Navbar/MobileSidebar/Layout';
+import NavbarMobileSidebarHeader from '@theme/Navbar/MobileSidebar/Header';
 import NavbarMobileSidebarPrimaryMenu from '@theme/Navbar/MobileSidebar/PrimaryMenu';
 import NavbarMobileSidebarSecondaryMenu from '@theme/Navbar/MobileSidebar/SecondaryMenu';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx
index 2c50446820..7036b2b6c1 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DefaultNavbarItem.tsx
@@ -7,16 +7,13 @@
 
 import React from 'react';
 import clsx from 'clsx';
-
 import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
-
+import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
 import type {
   DesktopOrMobileNavBarItemProps,
   Props,
 } from '@theme/NavbarItem/DefaultNavbarItem';
 
-import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
-
 function DefaultNavbarItemDesktop({
   className,
   isDropdownItem = false,
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx
index 1ed30afe40..797ef1ec2d 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocNavbarItem.tsx
@@ -6,12 +6,12 @@
  */
 
 import React from 'react';
-import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 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';
-import {useLayoutDoc} from '@docusaurus/theme-common';
 
 export default function DocNavbarItem({
   docId,
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx
index 9656648556..874605bcf1 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocSidebarNavbarItem.tsx
@@ -6,12 +6,11 @@
  */
 
 import React from 'react';
-import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import {useActiveDocContext} from '@docusaurus/plugin-content-docs/client';
 import clsx from 'clsx';
-import {getInfimaActiveClassName} from '@theme/NavbarItem/utils';
+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({
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
index 9624dc3dde..b351eeeef1 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionDropdownNavbarItem.tsx
@@ -6,8 +6,6 @@
  */
 
 import React from 'react';
-import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
-import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
 import {
   useVersions,
   useActiveDocContext,
@@ -17,8 +15,10 @@ import {
   useDocsVersionCandidates,
 } from '@docusaurus/theme-common';
 import {translate} from '@docusaurus/Translate';
-import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
+import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
+import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
 import type {Props} from '@theme/NavbarItem/DocsVersionDropdownNavbarItem';
+import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
 
 const getVersionMainDoc = (version: GlobalVersion) =>
   version.docs.find((doc) => doc.id === version.mainDocId)!;
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionNavbarItem.tsx
index db68737643..aade004e44 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DocsVersionNavbarItem.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import {useDocsVersionCandidates} from '@docusaurus/theme-common';
-import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
+import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem';
 import type {Props} from '@theme/NavbarItem/DocsVersionNavbarItem';
+import type {GlobalVersion} from '@docusaurus/plugin-content-docs/client';
 
 const getVersionMainDoc = (version: GlobalVersion) =>
   version.docs.find((doc) => doc.id === version.mainDocId)!;
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
index 37dd486924..ca5e03d92f 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/DropdownNavbarItem.tsx
@@ -14,15 +14,14 @@ import {
   isRegexpStringMatch,
   useLocalPathname,
 } from '@docusaurus/theme-common';
+import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
+import NavbarItem from '@theme/NavbarItem';
 import type {
   DesktopOrMobileNavBarItemProps,
   Props,
 } from '@theme/NavbarItem/DropdownNavbarItem';
 import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem';
 
-import NavbarNavLink from '@theme/NavbarItem/NavbarNavLink';
-import NavbarItem from '@theme/NavbarItem';
-
 const dropdownLinkActiveClass = 'dropdown__link--active';
 
 function isItemActive(
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 620a161b9d..2bb652c734 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/LocaleDropdownNavbarItem/index.tsx
@@ -6,13 +6,13 @@
  */
 
 import React from 'react';
-import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
-import IconLanguage from '@theme/IconLanguage';
-import type {Props} from '@theme/NavbarItem/LocaleDropdownNavbarItem';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import {useAlternatePageUtils} from '@docusaurus/theme-common';
 import {translate} from '@docusaurus/Translate';
+import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem';
+import IconLanguage from '@theme/IconLanguage';
 import type {LinkLikeNavbarItemProps} from '@theme/NavbarItem';
+import type {Props} from '@theme/NavbarItem/LocaleDropdownNavbarItem';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx
index e19758815f..94157e97ee 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/NavbarNavLink.tsx
@@ -8,10 +8,10 @@
 import React from 'react';
 import Link from '@docusaurus/Link';
 import useBaseUrl from '@docusaurus/useBaseUrl';
-import type {Props} from '@theme/NavbarItem/NavbarNavLink';
-import IconExternalLink from '@theme/IconExternalLink';
 import isInternalUrl from '@docusaurus/isInternalUrl';
 import {isRegexpStringMatch} from '@docusaurus/theme-common';
+import IconExternalLink from '@theme/IconExternalLink';
+import type {Props} from '@theme/NavbarItem/NavbarNavLink';
 
 const dropdownLinkActiveClass = 'dropdown__link--active';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx
index dfefa83dc1..9e95436025 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/SearchNavbarItem.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/NavbarItem/SearchNavbarItem';
 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 {
   if (mobile) {
diff --git a/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx
index 7ae0d49907..ca3253143a 100644
--- a/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NavbarItem/index.tsx
@@ -6,11 +6,10 @@
  */
 
 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 ComponentTypes from '@theme/NavbarItem/ComponentTypes';
-
 const getNavbarItemComponent = (type: NonNullable<Types>) => {
   const component = ComponentTypes[type];
   if (!component) {
diff --git a/packages/docusaurus-theme-classic/src/theme/NotFound.tsx b/packages/docusaurus-theme-classic/src/theme/NotFound.tsx
index 2213158d52..e6b9542f3d 100644
--- a/packages/docusaurus-theme-classic/src/theme/NotFound.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/NotFound.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
-import Layout from '@theme/Layout';
 import Translate, {translate} from '@docusaurus/Translate';
 import {PageMetadata} from '@docusaurus/theme-common';
+import Layout from '@theme/Layout';
 
 export default function NotFound(): JSX.Element {
   return (
diff --git a/packages/docusaurus-theme-classic/src/theme/SiteMetadata/index.tsx b/packages/docusaurus-theme-classic/src/theme/SiteMetadata/index.tsx
index ce53ddf1d9..5fa8275691 100644
--- a/packages/docusaurus-theme-classic/src/theme/SiteMetadata/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/SiteMetadata/index.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import Head from '@docusaurus/Head';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import useBaseUrl from '@docusaurus/useBaseUrl';
-import SearchMetadata from '@theme/SearchMetadata';
 import {
   PageMetadata,
   DEFAULT_SEARCH_TAG,
@@ -18,6 +17,7 @@ import {
   keyboardFocusedClassName,
 } from '@docusaurus/theme-common';
 import {useLocation} from '@docusaurus/router';
+import SearchMetadata from '@theme/SearchMetadata';
 
 // TODO move to SiteMetadataDefaults or theme-common ?
 // Useful for i18n/SEO
diff --git a/packages/docusaurus-theme-classic/src/theme/TOC/index.tsx b/packages/docusaurus-theme-classic/src/theme/TOC/index.tsx
index 79ca736645..08b2ddb4c1 100644
--- a/packages/docusaurus-theme-classic/src/theme/TOC/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TOC/index.tsx
@@ -7,8 +7,9 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import type {Props} from '@theme/TOC';
 import TOCItems from '@theme/TOCItems';
+import type {Props} from '@theme/TOC';
+
 import styles from './styles.module.css';
 
 // Using a custom className
diff --git a/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton.tsx b/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton/index.tsx
similarity index 94%
rename from packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton.tsx
rename to packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton/index.tsx
index 48eeb3afdb..54d9bf4155 100644
--- a/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton/index.tsx
@@ -8,9 +8,10 @@
 import React from 'react';
 import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
-import styles from './CollapseButton.module.css';
 import type {Props} from '@theme/TOCCollapsible/CollapseButton';
 
+import styles from './styles.module.css';
+
 export default function TOCCollapsibleCollapseButton({
   collapsed,
   ...props
diff --git a/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton.module.css b/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton.module.css
rename to packages/docusaurus-theme-classic/src/theme/TOCCollapsible/CollapseButton/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/index.tsx b/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/index.tsx
index de81863432..19680832c2 100644
--- a/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/index.tsx
@@ -8,10 +8,11 @@
 import React from 'react';
 import clsx from 'clsx';
 import {useCollapsible, Collapsible} from '@docusaurus/theme-common';
-import styles from './index.module.css';
 import TOCItems from '@theme/TOCItems';
-import type {Props} from '@theme/TOCCollapsible';
 import CollapseButton from '@theme/TOCCollapsible/CollapseButton';
+import type {Props} from '@theme/TOCCollapsible';
+
+import styles from './styles.module.css';
 
 export default function TOCCollapsible({
   toc,
diff --git a/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/index.module.css b/packages/docusaurus-theme-classic/src/theme/TOCCollapsible/styles.module.css
similarity index 100%
rename from packages/docusaurus-theme-classic/src/theme/TOCCollapsible/index.module.css
rename to packages/docusaurus-theme-classic/src/theme/TOCCollapsible/styles.module.css
diff --git a/packages/docusaurus-theme-classic/src/theme/TOCInline/index.tsx b/packages/docusaurus-theme-classic/src/theme/TOCInline/index.tsx
index b0bae1aafb..9864572f53 100644
--- a/packages/docusaurus-theme-classic/src/theme/TOCInline/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TOCInline/index.tsx
@@ -6,9 +6,10 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/TOCInline';
-import styles from './styles.module.css';
 import TOCItems from '@theme/TOCItems';
+import type {Props} from '@theme/TOCInline';
+
+import styles from './styles.module.css';
 
 export default function TOCInline({
   toc,
diff --git a/packages/docusaurus-theme-classic/src/theme/TOCItems/index.tsx b/packages/docusaurus-theme-classic/src/theme/TOCItems/index.tsx
index 544df3db72..3743706a44 100644
--- a/packages/docusaurus-theme-classic/src/theme/TOCItems/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TOCItems/index.tsx
@@ -6,14 +6,14 @@
  */
 
 import React, {useMemo} from 'react';
-import type {Props} from '@theme/TOCItems';
-import TOCItemTree from '@theme/TOCItems/Tree';
 import {
   type TOCHighlightConfig,
   useThemeConfig,
   useTOCHighlight,
   useFilteredAndTreeifiedTOC,
 } from '@docusaurus/theme-common';
+import TOCItemTree from '@theme/TOCItems/Tree';
+import type {Props} from '@theme/TOCItems';
 
 export default function TOCItems({
   toc,
diff --git a/packages/docusaurus-theme-classic/src/theme/TabItem/index.tsx b/packages/docusaurus-theme-classic/src/theme/TabItem/index.tsx
index 7b847dacc8..b0a6c3cdc0 100644
--- a/packages/docusaurus-theme-classic/src/theme/TabItem/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TabItem/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/TabItem';
 import clsx from 'clsx';
+import type {Props} from '@theme/TabItem';
 
 import styles from './styles.module.css';
 
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 b609058e80..f5d4f2d7f5 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
@@ -7,12 +7,12 @@
 
 import React from 'react';
 import renderer from 'react-test-renderer';
-import Tabs from '../index';
-import TabItem from '../../TabItem';
 import {
   TabGroupChoiceProvider,
   ScrollControllerProvider,
 } from '@docusaurus/theme-common';
+import Tabs from '../index';
+import TabItem from '../../TabItem';
 
 describe('Tabs', () => {
   it('rejects bad Tabs child', () => {
diff --git a/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx b/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
index 2e64f41460..5ee9649ac2 100644
--- a/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/Tabs/index.tsx
@@ -11,6 +11,7 @@ import React, {
   isValidElement,
   type ReactElement,
 } from 'react';
+import clsx from 'clsx';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import {
   useScrollPositionBlocker,
@@ -20,8 +21,6 @@ import {
 import type {Props} from '@theme/Tabs';
 import type {Props as TabItemProps} from '@theme/TabItem';
 
-import clsx from 'clsx';
-
 import styles from './styles.module.css';
 
 // A very rough duck type, but good enough to guard against mistakes while
diff --git a/packages/docusaurus-theme-classic/src/theme/TagsListByLetter/index.tsx b/packages/docusaurus-theme-classic/src/theme/TagsListByLetter/index.tsx
index c301c12e1a..326efa0c77 100644
--- a/packages/docusaurus-theme-classic/src/theme/TagsListByLetter/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/TagsListByLetter/index.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
+import {listTagsByLetters, type TagLetterEntry} from '@docusaurus/theme-common';
 import Tag from '@theme/Tag';
 import type {Props} from '@theme/TagsListByLetter';
-import {listTagsByLetters, type TagLetterEntry} from '@docusaurus/theme-common';
 
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-classic/src/theme/ThemedImage/index.tsx b/packages/docusaurus-theme-classic/src/theme/ThemedImage/index.tsx
index 0255e04805..b0b9383502 100644
--- a/packages/docusaurus-theme-classic/src/theme/ThemedImage/index.tsx
+++ b/packages/docusaurus-theme-classic/src/theme/ThemedImage/index.tsx
@@ -7,7 +7,6 @@
 
 import React from 'react';
 import clsx from 'clsx';
-
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import {useColorMode} from '@docusaurus/theme-common';
 import type {Props} from '@theme/ThemedImage';
diff --git a/packages/docusaurus-theme-classic/src/translations.ts b/packages/docusaurus-theme-classic/src/translations.ts
index 8d8bd673b4..cc087a87d8 100644
--- a/packages/docusaurus-theme-classic/src/translations.ts
+++ b/packages/docusaurus-theme-classic/src/translations.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
+import {mergeTranslations} from '@docusaurus/utils';
 import type {TranslationFile, TranslationFileContent} from '@docusaurus/types';
 import type {
   ThemeConfig,
@@ -15,9 +17,6 @@ import type {
   SimpleFooter,
 } from '@docusaurus/theme-common';
 
-import _ from 'lodash';
-import {mergeTranslations} from '@docusaurus/utils';
-
 function getNavbarTranslationFile(navbar: Navbar): TranslationFileContent {
   // TODO handle properly all the navbar item types here!
   function flattenNavbarItems(items: NavbarItem[]): NavbarItem[] {
diff --git a/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx b/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx
index 48ff620fba..8b88da3c8c 100644
--- a/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx
+++ b/packages/docusaurus-theme-common/src/components/Collapsible/index.tsx
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
 import React, {
   useState,
   useEffect,
@@ -17,6 +16,7 @@ import React, {
   type SetStateAction,
   type ReactNode,
 } from 'react';
+import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
 
 const DefaultAnimationEasing = 'ease-in-out';
 
diff --git a/packages/docusaurus-theme-common/src/components/Details/index.tsx b/packages/docusaurus-theme-common/src/components/Details/index.tsx
index 0936ccf9db..41c34097aa 100644
--- a/packages/docusaurus-theme-common/src/components/Details/index.tsx
+++ b/packages/docusaurus-theme-common/src/components/Details/index.tsx
@@ -11,8 +11,8 @@ import React, {
   type ComponentProps,
   type ReactElement,
 } from 'react';
-import useIsBrowser from '@docusaurus/useIsBrowser';
 import clsx from 'clsx';
+import useIsBrowser from '@docusaurus/useIsBrowser';
 import {useCollapsible, Collapsible} from '../Collapsible';
 import styles from './styles.module.css';
 
diff --git a/packages/docusaurus-theme-common/src/contexts/colorMode.tsx b/packages/docusaurus-theme-common/src/contexts/colorMode.tsx
index a2347f1c01..8d0513278e 100644
--- a/packages/docusaurus-theme-common/src/contexts/colorMode.tsx
+++ b/packages/docusaurus-theme-common/src/contexts/colorMode.tsx
@@ -14,9 +14,8 @@ import React, {
   useRef,
   type ReactNode,
 } from 'react';
-import {ReactContextError} from '../utils/reactUtils';
-
 import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
+import {ReactContextError} from '../utils/reactUtils';
 import {createStorageSlot} from '../utils/storageUtils';
 import {useThemeConfig} from '../utils/useThemeConfig';
 
diff --git a/packages/docusaurus-theme-common/src/contexts/docsPreferredVersion.tsx b/packages/docusaurus-theme-common/src/contexts/docsPreferredVersion.tsx
index 0922c2c33c..96e941143f 100644
--- a/packages/docusaurus-theme-common/src/contexts/docsPreferredVersion.tsx
+++ b/packages/docusaurus-theme-common/src/contexts/docsPreferredVersion.tsx
@@ -13,6 +13,13 @@ import React, {
   useCallback,
   type ReactNode,
 } from 'react';
+import {
+  useAllDocsData,
+  useDocsData,
+  type GlobalPluginData,
+  type GlobalVersion,
+} from '@docusaurus/plugin-content-docs/client';
+import {DEFAULT_PLUGIN_ID} from '@docusaurus/constants';
 import {
   useThemeConfig,
   type DocsVersionPersistence,
@@ -21,15 +28,6 @@ import {isDocsPluginEnabled} from '../utils/docsUtils';
 import {ReactContextError} from '../utils/reactUtils';
 import {createStorageSlot} from '../utils/storageUtils';
 
-import {
-  useAllDocsData,
-  useDocsData,
-  type GlobalPluginData,
-  type GlobalVersion,
-} from '@docusaurus/plugin-content-docs/client';
-
-import {DEFAULT_PLUGIN_ID} from '@docusaurus/constants';
-
 const storageKey = (pluginId: string) => `docs-preferred-version-${pluginId}`;
 
 const DocsPreferredVersionStorage = {
diff --git a/packages/docusaurus-theme-common/src/contexts/docsSidebar.tsx b/packages/docusaurus-theme-common/src/contexts/docsSidebar.tsx
index 6b0aab4762..43f109bf76 100644
--- a/packages/docusaurus-theme-common/src/contexts/docsSidebar.tsx
+++ b/packages/docusaurus-theme-common/src/contexts/docsSidebar.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, {useMemo, useContext, type ReactNode} from 'react';
-import type {PropSidebar} from '@docusaurus/plugin-content-docs';
 import {ReactContextError} from '../utils/reactUtils';
+import type {PropSidebar} from '@docusaurus/plugin-content-docs';
 
 // Using a Symbol because null is a valid context value (a doc with no sidebar)
 // Inspired by https://github.com/jamiebuilds/unstated-next/blob/master/src/unstated-next.tsx
diff --git a/packages/docusaurus-theme-common/src/contexts/docsVersion.tsx b/packages/docusaurus-theme-common/src/contexts/docsVersion.tsx
index efa8ffc147..4a3ad576f9 100644
--- a/packages/docusaurus-theme-common/src/contexts/docsVersion.tsx
+++ b/packages/docusaurus-theme-common/src/contexts/docsVersion.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, {type ReactNode, useContext} from 'react';
-import type {PropVersionMetadata} from '@docusaurus/plugin-content-docs';
 import {ReactContextError} from '../utils/reactUtils';
+import type {PropVersionMetadata} from '@docusaurus/plugin-content-docs';
 
 const Context = React.createContext<PropVersionMetadata | null>(null);
 
diff --git a/packages/docusaurus-theme-common/src/hooks/usePrismTheme.ts b/packages/docusaurus-theme-common/src/hooks/usePrismTheme.ts
index f25b68af71..655ef2ff45 100644
--- a/packages/docusaurus-theme-common/src/hooks/usePrismTheme.ts
+++ b/packages/docusaurus-theme-common/src/hooks/usePrismTheme.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {PrismTheme} from 'prism-react-renderer';
 import {useColorMode} from '../contexts/colorMode';
 import {useThemeConfig} from '../utils/useThemeConfig';
+import type {PrismTheme} from 'prism-react-renderer';
 
 /**
  * Returns a color-mode-dependent Prism theme: whatever the user specified in
diff --git a/packages/docusaurus-theme-common/src/hooks/useSearchPage.ts b/packages/docusaurus-theme-common/src/hooks/useSearchPage.ts
index 36c1cdaacf..10661b17f0 100644
--- a/packages/docusaurus-theme-common/src/hooks/useSearchPage.ts
+++ b/packages/docusaurus-theme-common/src/hooks/useSearchPage.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import {useCallback, useEffect, useState} from 'react';
 import {useHistory} from '@docusaurus/router';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
-import {useCallback, useEffect, useState} from 'react';
 
 const SEARCH_PARAM_QUERY = 'q';
 
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 532fb20a0a..b8ac8fb9ee 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/docsUtils.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/docsUtils.test.tsx
@@ -7,6 +7,8 @@
 
 import React from 'react';
 import {renderHook} from '@testing-library/react-hooks';
+import {StaticRouter} from 'react-router-dom';
+import {Context} from '@docusaurus/core/src/client/docusaurusContext';
 import {
   findFirstCategoryLink,
   isActiveSidebarItem,
@@ -17,8 +19,6 @@ import {
 } from '../docsUtils';
 import {DocsSidebarProvider} from '../../contexts/docsSidebar';
 import {DocsVersionProvider} from '../../contexts/docsVersion';
-import {StaticRouter} from 'react-router-dom';
-import {Context} from '@docusaurus/core/src/client/docusaurusContext';
 import type {
   PropSidebar,
   PropSidebarItem,
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 71c49527ab..6a2680fde1 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/generalUtils.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/generalUtils.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
-import {useTitleFormatter} from '../generalUtils';
 import {renderHook} from '@testing-library/react-hooks';
 import {Context} from '@docusaurus/core/src/client/docusaurusContext';
+import {useTitleFormatter} from '../generalUtils';
 import type {DocusaurusContext} from '@docusaurus/types';
 
 describe('useTitleFormatter', () => {
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/reactUtils.test.ts b/packages/docusaurus-theme-common/src/utils/__tests__/reactUtils.test.ts
index 0b3e11fa1d..3aaec1e347 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/reactUtils.test.ts
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/reactUtils.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {usePrevious} from '../reactUtils';
 import {renderHook} from '@testing-library/react-hooks';
+import {usePrevious} from '../reactUtils';
 
 describe('usePrevious', () => {
   it('returns the previous value of a variable', () => {
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/routesUtils.test.ts b/packages/docusaurus-theme-common/src/utils/__tests__/routesUtils.test.ts
index a226c13f11..3302107db2 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/routesUtils.test.ts
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/routesUtils.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {RouteConfig} from 'react-router-config';
 import {findHomePageRoute, isSamePath} from '../routesUtils';
+import type {RouteConfig} from 'react-router-config';
 
 describe('isSamePath', () => {
   it('returns true for compared path without trailing slash', () => {
diff --git a/packages/docusaurus-theme-common/src/utils/__tests__/tocUtils.test.ts b/packages/docusaurus-theme-common/src/utils/__tests__/tocUtils.test.ts
index 0ae93d7024..6424f8d341 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/tocUtils.test.ts
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/tocUtils.test.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {TOCItem} from '@docusaurus/types';
 import {renderHook} from '@testing-library/react-hooks';
 import {useFilteredAndTreeifiedTOC, useTreeifiedTOC} from '../tocUtils';
+import type {TOCItem} from '@docusaurus/mdx-loader';
 
 const mockTOC: TOCItem[] = [
   {
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 79ebd6cbca..e10b938baa 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/useAlternatePageUtils.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/useAlternatePageUtils.test.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import {useAlternatePageUtils} from '../useAlternatePageUtils';
 import {renderHook} from '@testing-library/react-hooks';
 import {StaticRouter} from 'react-router-dom';
 import {Context} from '@docusaurus/core/src/client/docusaurusContext';
+import {useAlternatePageUtils} from '../useAlternatePageUtils';
 import type {DocusaurusContext} from '@docusaurus/types';
 
 describe('useAlternatePageUtils', () => {
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 163e2f69bd..f2f6e18939 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/useLocalPathname.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/useLocalPathname.test.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import {useLocalPathname} from '../useLocalPathname';
 import {renderHook} from '@testing-library/react-hooks';
 import {StaticRouter} from 'react-router-dom';
 import {Context} from '@docusaurus/core/src/client/docusaurusContext';
+import {useLocalPathname} from '../useLocalPathname';
 import type {DocusaurusContext} from '@docusaurus/types';
 
 describe('useLocalPathname', () => {
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 10c471d2eb..f7618dbb25 100644
--- a/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
+++ b/packages/docusaurus-theme-common/src/utils/__tests__/usePluralForm.test.tsx
@@ -7,9 +7,9 @@
 
 import {jest} from '@jest/globals';
 import React from 'react';
-import {usePluralForm} from '../usePluralForm';
 import {renderHook} from '@testing-library/react-hooks';
 import {Context} from '@docusaurus/core/src/client/docusaurusContext';
+import {usePluralForm} from '../usePluralForm';
 import type {DocusaurusContext} from '@docusaurus/types';
 
 describe('usePluralForm', () => {
diff --git a/packages/docusaurus-theme-common/src/utils/docsUtils.tsx b/packages/docusaurus-theme-common/src/utils/docsUtils.tsx
index 706504118b..fd9cfb7ab1 100644
--- a/packages/docusaurus-theme-common/src/utils/docsUtils.tsx
+++ b/packages/docusaurus-theme-common/src/utils/docsUtils.tsx
@@ -6,6 +6,8 @@
  */
 
 import {useMemo} from 'react';
+import {matchPath, useLocation} from '@docusaurus/router';
+import renderRoutes from '@docusaurus/renderRoutes';
 import {
   useAllDocsData,
   useActivePlugin,
@@ -15,6 +17,12 @@ import {
   type GlobalSidebar,
   type GlobalDoc,
 } from '@docusaurus/plugin-content-docs/client';
+import type {Props as DocPageProps} from '@theme/DocPage';
+import {useDocsPreferredVersion} from '../contexts/docsPreferredVersion';
+import {useDocsVersion} from '../contexts/docsVersion';
+import {useDocsSidebar} from '../contexts/docsSidebar';
+import {uniq} from './jsUtils';
+import {isSamePath} from './routesUtils';
 import type {
   PropSidebar,
   PropSidebarItem,
@@ -22,14 +30,6 @@ import type {
   PropVersionDoc,
   PropSidebarBreadcrumbsItem,
 } from '@docusaurus/plugin-content-docs';
-import type {Props as DocPageProps} from '@theme/DocPage';
-import {useDocsPreferredVersion} from '../contexts/docsPreferredVersion';
-import {useDocsVersion} from '../contexts/docsVersion';
-import {useDocsSidebar} from '../contexts/docsSidebar';
-import {uniq} from './jsUtils';
-import {isSamePath} from './routesUtils';
-import {matchPath, useLocation} from '@docusaurus/router';
-import renderRoutes from '@docusaurus/renderRoutes';
 
 // TODO not ideal, see also "useDocs"
 export const isDocsPluginEnabled: boolean = !!useAllDocsData;
diff --git a/packages/docusaurus-theme-common/src/utils/metadataUtils.tsx b/packages/docusaurus-theme-common/src/utils/metadataUtils.tsx
index 9610faa2e4..af91c55a3a 100644
--- a/packages/docusaurus-theme-common/src/utils/metadataUtils.tsx
+++ b/packages/docusaurus-theme-common/src/utils/metadataUtils.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, {type ReactNode} from 'react';
-import Head from '@docusaurus/Head';
 import clsx from 'clsx';
+import Head from '@docusaurus/Head';
 import useRouteContext from '@docusaurus/useRouteContext';
 import {useBaseUrlUtils} from '@docusaurus/useBaseUrl';
 import {useTitleFormatter} from './generalUtils';
diff --git a/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx b/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx
index 79799c37fc..32095c3fea 100644
--- a/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx
+++ b/packages/docusaurus-theme-common/src/utils/scrollUtils.tsx
@@ -14,9 +14,9 @@ import React, {
   useRef,
   type ReactNode,
 } from 'react';
-import {useDynamicCallback, ReactContextError} from './reactUtils';
 import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
 import useIsBrowser from '@docusaurus/useIsBrowser';
+import {useDynamicCallback, ReactContextError} from './reactUtils';
 
 type ScrollController = {
   /** A boolean ref tracking whether scroll events are enabled. */
diff --git a/packages/docusaurus-theme-common/src/utils/searchUtils.ts b/packages/docusaurus-theme-common/src/utils/searchUtils.ts
index 463c69a90f..7f6fe91e48 100644
--- a/packages/docusaurus-theme-common/src/utils/searchUtils.ts
+++ b/packages/docusaurus-theme-common/src/utils/searchUtils.ts
@@ -9,8 +9,8 @@ import {
   useAllDocsData,
   useActivePluginAndVersion,
 } from '@docusaurus/plugin-content-docs/client';
-import {useDocsPreferredVersionByPluginId} from '../contexts/docsPreferredVersion';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
+import {useDocsPreferredVersionByPluginId} from '../contexts/docsPreferredVersion';
 
 export const DEFAULT_SEARCH_TAG = 'default';
 
diff --git a/packages/docusaurus-theme-common/src/utils/useLocationChange.ts b/packages/docusaurus-theme-common/src/utils/useLocationChange.ts
index dd8ec1d024..515493996e 100644
--- a/packages/docusaurus-theme-common/src/utils/useLocationChange.ts
+++ b/packages/docusaurus-theme-common/src/utils/useLocationChange.ts
@@ -7,8 +7,8 @@
 
 import {useEffect} from 'react';
 import {useLocation} from '@docusaurus/router';
-import type {Location} from 'history';
 import {useDynamicCallback, usePrevious} from './reactUtils';
+import type {Location} from 'history';
 
 /**
  * Fires an effect when the location changes (which includes hash, query, etc.).
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 7ca4c62f32..64a6cc3545 100644
--- a/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
+++ b/packages/docusaurus-theme-live-codeblock/src/theme/Playground/index.tsx
@@ -6,15 +6,16 @@
  */
 
 import React from 'react';
-import {LiveProvider, LiveEditor, LiveError, LivePreview} from 'react-live';
 import clsx from 'clsx';
+import useIsBrowser from '@docusaurus/useIsBrowser';
+import {LiveProvider, LiveEditor, LiveError, LivePreview} from 'react-live';
 import Translate from '@docusaurus/Translate';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import BrowserOnly from '@docusaurus/BrowserOnly';
 import {usePrismTheme} from '@docusaurus/theme-common';
-import styles from './styles.module.css';
-import useIsBrowser from '@docusaurus/useIsBrowser';
 import type {Props} from '@theme/Playground';
+
+import styles from './styles.module.css';
 import type {ThemeConfig} from '@docusaurus/theme-live-codeblock';
 
 function Header({children}: {children: React.ReactNode}) {
diff --git a/packages/docusaurus-theme-search-algolia/src/__tests__/validateThemeConfig.test.ts b/packages/docusaurus-theme-search-algolia/src/__tests__/validateThemeConfig.test.ts
index 71c13896b4..23be336647 100644
--- a/packages/docusaurus-theme-search-algolia/src/__tests__/validateThemeConfig.test.ts
+++ b/packages/docusaurus-theme-search-algolia/src/__tests__/validateThemeConfig.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {Joi} from '@docusaurus/utils-validation';
 import {validateThemeConfig, DEFAULT_CONFIG} from '../validateThemeConfig';
+import type {Joi} from '@docusaurus/utils-validation';
 
 function testValidateThemeConfig(themeConfig: {[key: string]: unknown}) {
   function validate(schema: Joi.Schema, cfg: {[key: string]: unknown}) {
diff --git a/packages/docusaurus-theme-search-algolia/src/index.ts b/packages/docusaurus-theme-search-algolia/src/index.ts
index 46f8016165..dbd2a58db3 100644
--- a/packages/docusaurus-theme-search-algolia/src/index.ts
+++ b/packages/docusaurus-theme-search-algolia/src/index.ts
@@ -7,12 +7,12 @@
 
 import path from 'path';
 import fs from 'fs-extra';
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
 import {defaultConfig, compile} from 'eta';
 import {normalizeUrl} from '@docusaurus/utils';
 import {readDefaultCodeTranslationMessages} from '@docusaurus/theme-translations';
-import logger from '@docusaurus/logger';
 import openSearchTemplate from './templates/opensearch';
-import _ from 'lodash';
 
 import type {LoadContext, Plugin} from '@docusaurus/types';
 import type {ThemeConfig} from '@docusaurus/theme-search-algolia';
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 6217dbf50b..217555ad31 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchBar/index.tsx
@@ -14,7 +14,6 @@ import Link from '@docusaurus/Link';
 import Head from '@docusaurus/Head';
 import {isRegexpStringMatch, useSearchPage} from '@docusaurus/theme-common';
 import {DocSearchButton, useDocSearchKeyboardEvents} from '@docsearch/react';
-import type {SearchClient} from 'algoliasearch/lite';
 import {useAlgoliaContextualFacetFilters} from '@docusaurus/theme-search-algolia/client';
 import Translate, {translate} from '@docusaurus/Translate';
 
@@ -26,6 +25,7 @@ import type {
   InternalDocSearchHit,
   StoredDocSearchHit,
 } from '@docsearch/react/dist/esm/types';
+import type {SearchClient} from 'algoliasearch/lite';
 import type {AutocompleteState} from '@algolia/autocomplete-core';
 
 type DocSearchProps = Omit<
diff --git a/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.tsx b/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.tsx
index 5a79ce3105..7be755278b 100644
--- a/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.tsx
+++ b/packages/docusaurus-theme-search-algolia/src/theme/SearchPage/index.tsx
@@ -8,10 +8,10 @@
 /* eslint-disable jsx-a11y/no-autofocus */
 
 import React, {useEffect, useState, useReducer, useRef} from 'react';
+import clsx from 'clsx';
 
 import algoliaSearch from 'algoliasearch/lite';
 import algoliaSearchHelper from 'algoliasearch-helper';
-import clsx from 'clsx';
 
 import Head from '@docusaurus/Head';
 import Link from '@docusaurus/Link';
@@ -26,8 +26,9 @@ import {
 } from '@docusaurus/theme-common';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import {useAllDocsData} from '@docusaurus/plugin-content-docs/client';
-import Layout from '@theme/Layout';
 import Translate, {translate} from '@docusaurus/Translate';
+import Layout from '@theme/Layout';
+
 import styles from './styles.module.css';
 import type {ThemeConfig} from '@docusaurus/theme-search-algolia';
 
diff --git a/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts b/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts
index 7bf0bf22a4..3b7a611cbc 100644
--- a/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts
+++ b/packages/docusaurus-theme-translations/locales/__tests__/locales.test.ts
@@ -6,10 +6,10 @@
  */
 
 import {jest} from '@jest/globals';
-import {extractThemeCodeMessages} from '../../src/utils';
 import path from 'path';
 import fs from 'fs-extra';
 import _ from 'lodash';
+import {extractThemeCodeMessages} from '../../src/utils';
 
 // Seems the 5s default timeout fails sometimes
 jest.setTimeout(15000);
diff --git a/packages/docusaurus-theme-translations/locales/fa/plugin-ideal-image.json b/packages/docusaurus-theme-translations/locales/fa/plugin-ideal-image.json
index 3576b692c0..2eb19a6e13 100644
--- a/packages/docusaurus-theme-translations/locales/fa/plugin-ideal-image.json
+++ b/packages/docusaurus-theme-translations/locales/fa/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": "۴۰۴. تصویر پیدا نشد.",
+  "theme.IdealImageMessage.error": "خطا. تلاش مجدد",
+  "theme.IdealImageMessage.load": "برای بارگزاری {sizeMessage} کلیک کنید",
+  "theme.IdealImageMessage.loading": "در حال بارگیری...",
+  "theme.IdealImageMessage.offline": "مرورگر شما آفلاین است. تصویر بارگیری نشده است."
 }
diff --git a/packages/docusaurus-theme-translations/locales/fa/plugin-pwa.json b/packages/docusaurus-theme-translations/locales/fa/plugin-pwa.json
index 91713f508a..7aac179a93 100644
--- a/packages/docusaurus-theme-translations/locales/fa/plugin-pwa.json
+++ b/packages/docusaurus-theme-translations/locales/fa/plugin-pwa.json
@@ -1,5 +1,5 @@
 {
   "theme.PwaReloadPopup.closeButtonAriaLabel": "بستن",
   "theme.PwaReloadPopup.info": "نسخه جدیدی منتشر شده است.",
-  "theme.PwaReloadPopup.refreshButtonText": "بروزرسانی"
+  "theme.PwaReloadPopup.refreshButtonText": "به روز رسانی"
 }
diff --git a/packages/docusaurus-theme-translations/locales/fa/theme-common.json b/packages/docusaurus-theme-translations/locales/fa/theme-common.json
index e698ebcc39..7a49fae6a4 100644
--- a/packages/docusaurus-theme-translations/locales/fa/theme-common.json
+++ b/packages/docusaurus-theme-translations/locales/fa/theme-common.json
@@ -3,38 +3,38 @@
   "theme.BackToTopButton.buttonAriaLabel": "بازگشت به بالا",
   "theme.CodeBlock.copied": "کپی شد",
   "theme.CodeBlock.copy": "کپی",
-  "theme.CodeBlock.copyButtonAriaLabel": "کپی به کلیپ بورد",
-  "theme.CodeBlock.wordWrapToggle": "Toggle word wrap",
-  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "Toggle the collapsible sidebar category '{label}'",
-  "theme.ErrorPageContent.title": "This page crashed.",
-  "theme.ErrorPageContent.tryAgain": "Try again",
-  "theme.NotFound.p1": "صفحه ای که دنبال آن بودید پیدا نشد.",
+  "theme.CodeBlock.copyButtonAriaLabel": "کپی به کلیپ‌بورد",
+  "theme.CodeBlock.wordWrapToggle": "تغییر نحوه نمایش کلمه",
+  "theme.DocSidebarItem.toggleCollapsedCategoryAriaLabel": "دسته‌بندی برچسب '{label}' در نوار کناری را تغییر دهید ",
+  "theme.ErrorPageContent.title": "بارگذاری صفحه با خطا روبرو شد.",
+  "theme.ErrorPageContent.tryAgain": "تلاش مجدد",
+  "theme.NotFound.p1": "صفحه‌ای که دنبال آن بودید پیدا نشد.",
   "theme.NotFound.p2": "لطفا با صاحب وبسایت تماس بگیرید و ایشان را از مشکل پیش آمده مطلع کنید.",
   "theme.NotFound.title": "صفحه ای که دنبال آن بودید پیدا نشد.",
   "theme.TOCCollapsible.toggleButtonLabel": "مطالب این صفحه",
   "theme.blog.archive.description": "آرشیو",
   "theme.blog.archive.title": "آرشیو",
-  "theme.blog.paginator.navAriaLabel": "کنترل لیست مطالب وبلاک",
-  "theme.blog.paginator.newerEntries": "مطالب جدید تر",
-  "theme.blog.paginator.olderEntries": "مطالب قدیمی تر",
-  "theme.blog.post.paginator.navAriaLabel": "کنترل پست های صفحه وبلاگ",
-  "theme.blog.post.paginator.newerPost": "پست جدید تر",
-  "theme.blog.post.paginator.olderPost": "پست قدیمی تر",
+  "theme.blog.paginator.navAriaLabel": "کنترل لیست مطالب وبلاگ",
+  "theme.blog.paginator.newerEntries": "مطالب جدید‌تر",
+  "theme.blog.paginator.olderEntries": "مطالب قدیمی‌تر",
+  "theme.blog.post.paginator.navAriaLabel": "کنترل پست‌های صفحه وبلاگ",
+  "theme.blog.post.paginator.newerPost": "پست جدید‌تر",
+  "theme.blog.post.paginator.olderPost": "پست قدیمی‌تر",
   "theme.blog.post.plurals": "یک پست|{count} پست",
   "theme.blog.post.readMore": "ادامه مطلب",
-  "theme.blog.post.readMoreLabel": "Read more about {title}",
+  "theme.blog.post.readMoreLabel": "درباره {title} بیشتر بخوانید",
   "theme.blog.post.readingTime.plurals": "خواندن ۱ دقیقه|خواندن {readingTime} دقیقه",
-  "theme.blog.sidebar.navAriaLabel": "کنترل پست های اخیر وبلاگ",
+  "theme.blog.sidebar.navAriaLabel": "کنترل پست‌های اخیر وبلاگ",
   "theme.blog.tagTitle": "{nPosts} با برچسب \"{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": "بین حالت تاریک و روشن سوئیچ کنید (الان {mode})",
+  "theme.colorToggle.ariaLabel.mode.dark": "حالت تیره",
+  "theme.colorToggle.ariaLabel.mode.light": "حالت روشن",
   "theme.common.editThisPage": "ویرایش مطالب این صفحه",
   "theme.common.headingLinkTitle": "لینک مستقیم به عنوان",
   "theme.common.skipToMainContent": "پرش به مطلب اصلی",
-  "theme.docs.DocCard.categoryDescription": "{count} items",
-  "theme.docs.breadcrumbs.home": "Home page",
-  "theme.docs.breadcrumbs.navAriaLabel": "Breadcrumbs",
+  "theme.docs.DocCard.categoryDescription": "{count} مورد",
+  "theme.docs.breadcrumbs.home": "صفحه اصلی",
+  "theme.docs.breadcrumbs.navAriaLabel": "نشانگر صفحات",
   "theme.docs.paginator.navAriaLabel": "کنترل صفحات مطالب",
   "theme.docs.paginator.next": "بعدی",
   "theme.docs.paginator.previous": "قبلی",
@@ -44,18 +44,18 @@
   "theme.docs.sidebar.expandButtonTitle": "باز کردن نوار کناری",
   "theme.docs.tagDocListPageTitle": "{nDocsTagged} با \"{tagName}\"",
   "theme.docs.tagDocListPageTitle.nDocsTagged": "یک مطلب برچسب شده|{count} مطلب برچسب شده",
-  "theme.docs.versionBadge.label": "Version: {versionLabel}",
+  "theme.docs.versionBadge.label": "نسخه: {versionLabel}",
   "theme.docs.versions.latestVersionLinkLabel": "آخرین نسخه",
   "theme.docs.versions.latestVersionSuggestionLabel": "برای دیدن آخرین نسخه این متن، نسخه {latestVersionLink} ({versionLabel}) را ببینید.",
-  "theme.docs.versions.unmaintainedVersionLabel": "نسخه {siteTitle} {versionLabel} دیگر به روزرسانی نمی شود.",
+  "theme.docs.versions.unmaintainedVersionLabel": "نسخه {siteTitle} {versionLabel} دیگر به روز رسانی نمی شود.",
   "theme.docs.versions.unreleasedVersionLabel": "نسخه {siteTitle} {versionLabel} هنوز به صورت کامل منتشر نشده است.",
   "theme.lastUpdated.atDate": " در تاریخ {date}",
   "theme.lastUpdated.byUser": " توسط {user}",
-  "theme.lastUpdated.lastUpdatedAtBy": "آخرین بروزرسانی{atDate}{byUser}",
+  "theme.lastUpdated.lastUpdatedAtBy": "آخرین به روز رسانی{atDate}{byUser}",
   "theme.navbar.mobileLanguageDropdown.label": "Languages",
   "theme.navbar.mobileSidebarSecondaryMenu.backButtonLabel": "→ بازگشت به منو اصلی",
-  "theme.navbar.mobileVersionsDropdown.label": "نسخه ها",
-  "theme.tags.tagsListLabel": "برچسب ها:",
-  "theme.tags.tagsPageLink": "مشاهده تمام برچسب ها",
-  "theme.tags.tagsPageTitle": "برچسب ها"
+  "theme.navbar.mobileVersionsDropdown.label": "نسخه‌ها",
+  "theme.tags.tagsListLabel": "برچسب‌ها:",
+  "theme.tags.tagsPageLink": "مشاهده تمام برچسب‌ها",
+  "theme.tags.tagsPageTitle": "برچسب‌ها"
 }
diff --git a/packages/docusaurus-theme-translations/locales/fa/theme-live-codeblock.json b/packages/docusaurus-theme-translations/locales/fa/theme-live-codeblock.json
index 5b919380db..b13c7da77f 100644
--- a/packages/docusaurus-theme-translations/locales/fa/theme-live-codeblock.json
+++ b/packages/docusaurus-theme-translations/locales/fa/theme-live-codeblock.json
@@ -1,4 +1,4 @@
 {
   "theme.Playground.liveEditor": "ویرایشگر زنده",
-  "theme.Playground.result": "نتیجه"
+  "theme.Playground.result": "خروجی"
 }
diff --git a/packages/docusaurus-theme-translations/locales/fa/theme-search-algolia.json b/packages/docusaurus-theme-translations/locales/fa/theme-search-algolia.json
index d456a81151..f8e9441a58 100644
--- a/packages/docusaurus-theme-translations/locales/fa/theme-search-algolia.json
+++ b/packages/docusaurus-theme-translations/locales/fa/theme-search-algolia.json
@@ -1,6 +1,6 @@
 {
   "theme.SearchBar.label": "جستجو",
-  "theme.SearchBar.seeAll": "See all {count} results",
+  "theme.SearchBar.seeAll": "نمایش {count} نتیجه",
   "theme.SearchPage.algoliaLabel": "جستجو با Algolia",
   "theme.SearchPage.documentsFound.plurals": "یک مورد پیدا شد|{count} مورد پیدا شد",
   "theme.SearchPage.emptyResultsTitle": "جستجو در متن",
diff --git a/packages/docusaurus-theme-translations/update.mjs b/packages/docusaurus-theme-translations/update.mjs
index 85736bf696..73fa9c6c5f 100644
--- a/packages/docusaurus-theme-translations/update.mjs
+++ b/packages/docusaurus-theme-translations/update.mjs
@@ -7,11 +7,11 @@
 
 // @ts-check
 
-import logger from '@docusaurus/logger';
 import path from 'path';
 import {fileURLToPath} from 'url';
 import fs from 'fs-extra';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
 import {getThemes, extractThemeCodeMessages} from './lib/utils.js';
 
 const LocalesDirPath = fileURLToPath(new URL('locales', import.meta.url));
diff --git a/packages/docusaurus-types/package.json b/packages/docusaurus-types/package.json
index 9d1849ff36..b50c2100a5 100644
--- a/packages/docusaurus-types/package.json
+++ b/packages/docusaurus-types/package.json
@@ -21,7 +21,7 @@
     "joi": "^17.6.0",
     "react-helmet-async": "^1.3.0",
     "utility-types": "^3.10.0",
-    "webpack": "^5.72.0",
+    "webpack": "^5.72.1",
     "webpack-merge": "^5.8.0"
   },
   "peerDependencies": {
diff --git a/packages/docusaurus-utils-validation/src/validationSchemas.ts b/packages/docusaurus-utils-validation/src/validationSchemas.ts
index f8e9a1c36e..eea887bea2 100644
--- a/packages/docusaurus-utils-validation/src/validationSchemas.ts
+++ b/packages/docusaurus-utils-validation/src/validationSchemas.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import Joi from './Joi';
 import {isValidPathname, DEFAULT_PLUGIN_ID, type Tag} from '@docusaurus/utils';
+import Joi from './Joi';
 import {JoiFrontMatter} from './JoiFrontMatter';
 
 export const PluginIdSchema = Joi.string()
diff --git a/packages/docusaurus-utils-validation/src/validationUtils.ts b/packages/docusaurus-utils-validation/src/validationUtils.ts
index 33145624da..5d87c1a5e8 100644
--- a/packages/docusaurus-utils-validation/src/validationUtils.ts
+++ b/packages/docusaurus-utils-validation/src/validationUtils.ts
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type Joi from './Joi';
 import logger from '@docusaurus/logger';
 import Yaml from 'js-yaml';
 import {PluginIdSchema} from './validationSchemas';
+import type Joi from './Joi';
 
 /** Print warnings returned from Joi validation. */
 export function printWarning(warning?: Joi.ValidationError): void {
diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json
index bac83d169f..cdddacda8d 100644
--- a/packages/docusaurus-utils/package.json
+++ b/packages/docusaurus-utils/package.json
@@ -32,7 +32,7 @@
     "shelljs": "^0.8.5",
     "tslib": "^2.4.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.72.0"
+    "webpack": "^5.72.1"
   },
   "engines": {
     "node": ">=14"
diff --git a/packages/docusaurus-utils/src/__tests__/emitUtils.test.ts b/packages/docusaurus-utils/src/__tests__/emitUtils.test.ts
index 236d9c224d..0e97013b9e 100644
--- a/packages/docusaurus-utils/src/__tests__/emitUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/emitUtils.test.ts
@@ -6,9 +6,9 @@
  */
 
 import {jest} from '@jest/globals';
-import {readOutputHTMLFile, generate} from '../emitUtils';
 import path from 'path';
 import fs from 'fs-extra';
+import {readOutputHTMLFile, generate} from '../emitUtils';
 
 describe('readOutputHTMLFile', () => {
   it('reads both files with trailing slash undefined', async () => {
diff --git a/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts b/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts
index 1d4519536c..d701b8bca3 100644
--- a/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/gitUtils.test.ts
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {FileNotTrackedError, getFileCommitDate} from '../gitUtils';
 import fs from 'fs-extra';
 import path from 'path';
 import {createTempRepo} from '@testing-utils/git';
+import {FileNotTrackedError, getFileCommitDate} from '../gitUtils';
 
 /* eslint-disable no-restricted-properties */
 function initializeTempRepo() {
diff --git a/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts b/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts
index 6db16ef20f..ca7218ab02 100644
--- a/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/jsUtils.test.ts
@@ -6,6 +6,7 @@
  */
 
 import {jest} from '@jest/globals';
+import _ from 'lodash';
 import {
   removeSuffix,
   removePrefix,
@@ -13,7 +14,6 @@ import {
   findAsyncSequential,
   reportMessage,
 } from '../jsUtils';
-import _ from 'lodash';
 
 describe('removeSuffix', () => {
   it("is no-op when suffix doesn't exist", () => {
diff --git a/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts b/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts
index 09488bc4a6..2f4baa74cc 100644
--- a/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/markdownUtils.test.ts
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import dedent from 'dedent';
 import {
   createExcerpt,
   parseMarkdownContentTitle,
@@ -12,7 +13,6 @@ import {
   parseMarkdownHeadingId,
   writeMarkdownHeadingId,
 } from '../markdownUtils';
-import dedent from 'dedent';
 
 describe('createExcerpt', () => {
   it('creates excerpt for text-only content', () => {
diff --git a/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts b/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts
index eaf2b61cd9..eb6cc8d13f 100644
--- a/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts
+++ b/packages/docusaurus-utils/src/__tests__/pathUtils.test.ts
@@ -6,6 +6,7 @@
  */
 
 import {jest} from '@jest/globals';
+import path from 'path';
 import {
   isNameTooLong,
   shortName,
@@ -15,7 +16,6 @@ import {
   toMessageRelativeFilePath,
   addTrailingPathSeparator,
 } from '../pathUtils';
-import path from 'path';
 
 describe('isNameTooLong', () => {
   it('works', () => {
diff --git a/packages/docusaurus-utils/src/dataFileUtils.ts b/packages/docusaurus-utils/src/dataFileUtils.ts
index 34ed9befeb..937d22b9cf 100644
--- a/packages/docusaurus-utils/src/dataFileUtils.ts
+++ b/packages/docusaurus-utils/src/dataFileUtils.ts
@@ -6,11 +6,11 @@
  */
 
 import fs from 'fs-extra';
-import Yaml from 'js-yaml';
 import path from 'path';
+import logger from '@docusaurus/logger';
+import Yaml from 'js-yaml';
 import {findAsyncSequential} from './index';
 import type {ContentPaths} from './markdownLinks';
-import logger from '@docusaurus/logger';
 
 type DataFileParams = {
   /** Path to the potential data file, relative to `contentPaths` */
diff --git a/packages/docusaurus-utils/src/globUtils.ts b/packages/docusaurus-utils/src/globUtils.ts
index 67af9051ee..d95fa35b54 100644
--- a/packages/docusaurus-utils/src/globUtils.ts
+++ b/packages/docusaurus-utils/src/globUtils.ts
@@ -7,8 +7,8 @@
 
 // Globby/Micromatch are the 2 libs we use in Docusaurus consistently
 
-import Micromatch from 'micromatch'; // Note: Micromatch is used by Globby
 import path from 'path';
+import Micromatch from 'micromatch'; // Note: Micromatch is used by Globby
 
 /** A re-export of the globby instance. */
 export {default as Globby} from 'globby';
diff --git a/packages/docusaurus-utils/src/i18nUtils.ts b/packages/docusaurus-utils/src/i18nUtils.ts
index e7e29815be..a6d08cf837 100644
--- a/packages/docusaurus-utils/src/i18nUtils.ts
+++ b/packages/docusaurus-utils/src/i18nUtils.ts
@@ -7,13 +7,13 @@
 
 import path from 'path';
 import _ from 'lodash';
+import {DEFAULT_PLUGIN_ID, I18N_DIR_NAME} from './constants';
+import {normalizeUrl} from './urlUtils';
 import type {
   TranslationFileContent,
   TranslationFile,
   I18n,
 } from '@docusaurus/types';
-import {DEFAULT_PLUGIN_ID, I18N_DIR_NAME} from './constants';
-import {normalizeUrl} from './urlUtils';
 
 /**
  * Takes a list of translation file contents, and shallow-merges them into one.
diff --git a/packages/docusaurus-utils/src/jsUtils.ts b/packages/docusaurus-utils/src/jsUtils.ts
index 1e2858fe62..2d1f228f1e 100644
--- a/packages/docusaurus-utils/src/jsUtils.ts
+++ b/packages/docusaurus-utils/src/jsUtils.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {ReportingSeverity} from '@docusaurus/types';
 import logger from '@docusaurus/logger';
+import type {ReportingSeverity} from '@docusaurus/types';
 
 /** Removes a given string suffix from `str`. */
 export function removeSuffix(str: string, suffix: string): string {
diff --git a/packages/docusaurus-utils/src/urlUtils.ts b/packages/docusaurus-utils/src/urlUtils.ts
index c6ad13d2d8..708d50dbfe 100644
--- a/packages/docusaurus-utils/src/urlUtils.ts
+++ b/packages/docusaurus-utils/src/urlUtils.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {removeSuffix} from './jsUtils';
 import resolvePathnameUnsafe from 'resolve-pathname';
+import {removeSuffix} from './jsUtils';
 
 /**
  * Much like `path.join`, but much better. Takes an array of URL segments, and
diff --git a/packages/docusaurus-utils/src/webpackUtils.ts b/packages/docusaurus-utils/src/webpackUtils.ts
index 4116867c9d..fa579e06b4 100644
--- a/packages/docusaurus-utils/src/webpackUtils.ts
+++ b/packages/docusaurus-utils/src/webpackUtils.ts
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {RuleSetRule} from 'webpack';
 import path from 'path';
 import {escapePath} from './pathUtils';
 import {
   WEBPACK_URL_LOADER_LIMIT,
   OUTPUT_STATIC_ASSETS_DIR_NAME,
 } from './constants';
+import type {RuleSetRule} from 'webpack';
 
 type AssetFolder = 'images' | 'files' | 'fonts' | 'medias';
 
diff --git a/packages/docusaurus/bin/beforeCli.mjs b/packages/docusaurus/bin/beforeCli.mjs
index 0c374dba17..fa4cecdbc7 100644
--- a/packages/docusaurus/bin/beforeCli.mjs
+++ b/packages/docusaurus/bin/beforeCli.mjs
@@ -7,13 +7,13 @@
 
 // @ts-check
 
-import logger from '@docusaurus/logger';
 import fs from 'fs-extra';
-import semver from 'semver';
 import path from 'path';
+import {createRequire} from 'module';
+import logger from '@docusaurus/logger';
+import semver from 'semver';
 import updateNotifier from 'update-notifier';
 import boxen from 'boxen';
-import {createRequire} from 'module';
 import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 
 const packageJson = createRequire(import.meta.url)('../package.json');
diff --git a/packages/docusaurus/bin/docusaurus.mjs b/packages/docusaurus/bin/docusaurus.mjs
index 759aad41cc..ec6a5cfffb 100755
--- a/packages/docusaurus/bin/docusaurus.mjs
+++ b/packages/docusaurus/bin/docusaurus.mjs
@@ -8,8 +8,8 @@
 
 // @ts-check
 
-import logger from '@docusaurus/logger';
 import fs from 'fs-extra';
+import logger from '@docusaurus/logger';
 import cli from 'commander';
 import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 import {
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index 8902b3e71b..4019070675 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -60,7 +60,7 @@
     "combine-promises": "^1.1.0",
     "commander": "^5.1.0",
     "copy-webpack-plugin": "^10.2.4",
-    "core-js": "^3.22.4",
+    "core-js": "^3.22.5",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^3.4.1",
     "cssnano": "^5.1.7",
@@ -97,7 +97,7 @@
     "update-notifier": "^5.1.0",
     "url-loader": "^4.1.1",
     "wait-on": "^6.0.1",
-    "webpack": "^5.72.0",
+    "webpack": "^5.72.1",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-dev-server": "^4.9.0",
     "webpack-merge": "^5.8.0",
diff --git a/packages/docusaurus/src/client/App.tsx b/packages/docusaurus/src/client/App.tsx
index c709c2e851..da3a1ef22f 100644
--- a/packages/docusaurus/src/client/App.tsx
+++ b/packages/docusaurus/src/client/App.tsx
@@ -10,18 +10,20 @@ import '@generated/client-modules';
 
 import routes from '@generated/routes';
 import {useLocation} from '@docusaurus/router';
-import normalizeLocation from './normalizeLocation';
 import renderRoutes from '@docusaurus/renderRoutes';
+import Root from '@theme/Root';
+import SiteMetadata from '@theme/SiteMetadata';
+import normalizeLocation from './normalizeLocation';
 import {BrowserContextProvider} from './browserContext';
 import {DocusaurusContextProvider} from './docusaurusContext';
 import PendingNavigation from './PendingNavigation';
 import BaseUrlIssueBanner from './BaseUrlIssueBanner';
 import SiteMetadataDefaults from './SiteMetadataDefaults';
-import Root from '@theme/Root';
-import SiteMetadata from '@theme/SiteMetadata';
 
 // 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 {
diff --git a/packages/docusaurus/src/client/docusaurusContext.tsx b/packages/docusaurus/src/client/docusaurusContext.tsx
index 5023b1eced..5bed42737f 100644
--- a/packages/docusaurus/src/client/docusaurusContext.tsx
+++ b/packages/docusaurus/src/client/docusaurusContext.tsx
@@ -6,13 +6,12 @@
  */
 
 import React, {type ReactNode} from 'react';
-import type {DocusaurusContext} from '@docusaurus/types';
-
 import siteConfig from '@generated/docusaurus.config';
 import globalData from '@generated/globalData';
 import i18n from '@generated/i18n';
 import codeTranslations from '@generated/codeTranslations';
 import siteMetadata from '@generated/site-metadata';
+import type {DocusaurusContext} from '@docusaurus/types';
 
 // Static value on purpose: don't make it dynamic!
 // Using context is still useful for testability reasons.
diff --git a/packages/docusaurus/src/client/exports/ComponentCreator.tsx b/packages/docusaurus/src/client/exports/ComponentCreator.tsx
index 7c79b33575..77439b3642 100644
--- a/packages/docusaurus/src/client/exports/ComponentCreator.tsx
+++ b/packages/docusaurus/src/client/exports/ComponentCreator.tsx
@@ -7,12 +7,18 @@
 
 import React from 'react';
 import Loadable from 'react-loadable';
-import Loading from '@theme/Loading';
 import routesChunkNames from '@generated/routesChunkNames';
 import registry from '@generated/registry';
+import Loading from '@theme/Loading';
 import flat from '../flat';
 import {RouteContextProvider} from '../routeContext';
 
+declare global {
+  interface NodeRequire {
+    resolveWeak: (name: string) => number;
+  }
+}
+
 export default function ComponentCreator(
   path: string,
   hash: string,
@@ -21,14 +27,19 @@ export default function ComponentCreator(
   if (path === '*') {
     return Loadable({
       loading: Loading,
-      loader: () =>
-        import('@theme/NotFound').then(({default: NotFound}) => (props) => (
+      loader: () => import('@theme/NotFound'),
+      modules: ['@theme/NotFound'],
+      webpack: () => [require.resolveWeak('@theme/NotFound')],
+      render(loaded, props) {
+        const NotFound = loaded.default;
+        return (
           <RouteContextProvider
             // Do we want a better name than native-default?
             value={{plugin: {name: 'native', id: 'default'}}}>
-            <NotFound {...(props as never)} />
+            <NotFound {...(props as JSX.IntrinsicAttributes)} />
           </RouteContextProvider>
-        )),
+        );
+      },
     });
   }
 
@@ -60,7 +71,7 @@ export default function ComponentCreator(
     loader,
     modules,
     webpack: () => optsWebpack,
-    render: (loaded, props) => {
+    render(loaded, props) {
       // `loaded` will be a map from key path (as returned from the flattened
       // chunk names) to the modules loaded from the loaders. We now have to
       // restore the chunk names' previous shape from this flat record.
diff --git a/packages/docusaurus/src/client/exports/ErrorBoundary.tsx b/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
index 11880aa67f..b8dd78fe1a 100644
--- a/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
+++ b/packages/docusaurus/src/client/exports/ErrorBoundary.tsx
@@ -6,10 +6,9 @@
  */
 
 import React, {type ReactNode} from 'react';
-
 import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
-import type {Props} from '@docusaurus/ErrorBoundary';
 import DefaultFallback from '@theme/Error';
+import type {Props} from '@docusaurus/ErrorBoundary';
 
 type State = {
   error: Error | null;
diff --git a/packages/docusaurus/src/client/exports/Link.tsx b/packages/docusaurus/src/client/exports/Link.tsx
index 3628e74954..78a3f91a6b 100644
--- a/packages/docusaurus/src/client/exports/Link.tsx
+++ b/packages/docusaurus/src/client/exports/Link.tsx
@@ -11,15 +11,13 @@ import React, {
   useRef,
   type ComponentType,
 } from 'react';
-
 import {NavLink, Link as RRLink} from 'react-router-dom';
+import {applyTrailingSlash} from '@docusaurus/utils-common';
 import useDocusaurusContext from './useDocusaurusContext';
 import isInternalUrl from './isInternalUrl';
 import ExecutionEnvironment from './ExecutionEnvironment';
 import {useLinksCollector} from '../LinksCollector';
 import {useBaseUrlUtils} from './useBaseUrl';
-import {applyTrailingSlash} from '@docusaurus/utils-common';
-
 import type {Props} from '@docusaurus/Link';
 
 // TODO all this wouldn't be necessary if we used ReactRouter basename feature
diff --git a/packages/docusaurus/src/client/exports/Translate.tsx b/packages/docusaurus/src/client/exports/Translate.tsx
index 5cfbef7edb..b886065638 100644
--- a/packages/docusaurus/src/client/exports/Translate.tsx
+++ b/packages/docusaurus/src/client/exports/Translate.tsx
@@ -7,10 +7,9 @@
 
 import React from 'react';
 import {interpolate, type InterpolateValues} from '@docusaurus/Interpolate';
-import type {TranslateParam, TranslateProps} from '@docusaurus/Translate';
-
 // Can't read it from context, due to exposing imperative API
 import codeTranslations from '@generated/codeTranslations';
+import type {TranslateParam, TranslateProps} from '@docusaurus/Translate';
 
 function getLocalizedMessage({
   id,
diff --git a/packages/docusaurus/src/client/exports/__tests__/Head.test.tsx b/packages/docusaurus/src/client/exports/__tests__/Head.test.tsx
index 847fa52391..067fc9ea25 100644
--- a/packages/docusaurus/src/client/exports/__tests__/Head.test.tsx
+++ b/packages/docusaurus/src/client/exports/__tests__/Head.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
-import Head from '../Head';
 import {type FilledContext, HelmetProvider} from 'react-helmet-async';
 import renderer from 'react-test-renderer';
+import Head from '../Head';
 
 describe('Head', () => {
   it('does exactly what Helmet does', () => {
diff --git a/packages/docusaurus/src/client/exports/useRouteContext.tsx b/packages/docusaurus/src/client/exports/useRouteContext.tsx
index 9ba1a1f570..ea80925c32 100644
--- a/packages/docusaurus/src/client/exports/useRouteContext.tsx
+++ b/packages/docusaurus/src/client/exports/useRouteContext.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type {PluginRouteContext} from '@docusaurus/types';
 import {Context} from '../routeContext';
+import type {PluginRouteContext} from '@docusaurus/types';
 
 export default function useRouteContext(): PluginRouteContext {
   const context = React.useContext(Context);
diff --git a/packages/docusaurus/src/client/serverEntry.tsx b/packages/docusaurus/src/client/serverEntry.tsx
index 408bfee0e3..27902e72e8 100644
--- a/packages/docusaurus/src/client/serverEntry.tsx
+++ b/packages/docusaurus/src/client/serverEntry.tsx
@@ -5,26 +5,25 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import * as eta from 'eta';
 import React from 'react';
+import path from 'path';
+import fs from 'fs-extra';
+// eslint-disable-next-line no-restricted-imports
+import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import * as eta from 'eta';
 import {StaticRouter} from 'react-router-dom';
 import ReactDOMServer from 'react-dom/server';
 import {HelmetProvider, type FilledContext} from 'react-helmet-async';
 import {getBundles, type Manifest} from 'react-loadable-ssr-addon-v5-slorber';
 import Loadable from 'react-loadable';
-
 import {minify} from 'html-minifier-terser';
-import path from 'path';
-import fs from 'fs-extra';
 import preload from './preload';
 import App from './App';
 import {
   createStatefulLinksCollector,
   LinksCollectorProvider,
 } from './LinksCollector';
-import logger from '@docusaurus/logger';
-// eslint-disable-next-line no-restricted-imports
-import _ from 'lodash';
 import type {Locals} from '@slorber/static-site-generator-webpack-plugin';
 
 const getCompiledSSRTemplate = _.memoize((template: string) =>
diff --git a/packages/docusaurus/src/client/theme-fallback/Error/index.tsx b/packages/docusaurus/src/client/theme-fallback/Error/index.tsx
index 3376d906ea..513348cce4 100644
--- a/packages/docusaurus/src/client/theme-fallback/Error/index.tsx
+++ b/packages/docusaurus/src/client/theme-fallback/Error/index.tsx
@@ -9,10 +9,10 @@
 /* eslint-disable @docusaurus/no-untranslated-text */
 
 import React from 'react';
-import Layout from '@theme/Layout';
-import ErrorBoundary from '@docusaurus/ErrorBoundary';
-import type {Props} from '@theme/Error';
 import Head from '@docusaurus/Head';
+import ErrorBoundary from '@docusaurus/ErrorBoundary';
+import Layout from '@theme/Layout';
+import type {Props} from '@theme/Error';
 
 function ErrorDisplay({error, tryAgain}: Props): JSX.Element {
   return (
diff --git a/packages/docusaurus/src/client/theme-fallback/NotFound/index.tsx b/packages/docusaurus/src/client/theme-fallback/NotFound/index.tsx
index 78f83dcc2c..b7d5ea8b39 100644
--- a/packages/docusaurus/src/client/theme-fallback/NotFound/index.tsx
+++ b/packages/docusaurus/src/client/theme-fallback/NotFound/index.tsx
@@ -9,8 +9,8 @@
 /* eslint-disable @docusaurus/no-untranslated-text */
 
 import React from 'react';
-import Layout from '@theme/Layout';
 import Head from '@docusaurus/Head';
+import Layout from '@theme/Layout';
 
 export default function NotFound(): JSX.Element {
   return (
diff --git a/packages/docusaurus/src/commands/build.ts b/packages/docusaurus/src/commands/build.ts
index 555cb76bd6..d13d7039fe 100644
--- a/packages/docusaurus/src/commands/build.ts
+++ b/packages/docusaurus/src/commands/build.ts
@@ -5,18 +5,17 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
-import CopyWebpackPlugin from 'copy-webpack-plugin';
 import fs from 'fs-extra';
 import path from 'path';
+import logger from '@docusaurus/logger';
+import {mapAsyncSequential} from '@docusaurus/utils';
+import CopyWebpackPlugin from 'copy-webpack-plugin';
 import ReactLoadableSSRAddon from 'react-loadable-ssr-addon-v5-slorber';
-import type {Configuration} from 'webpack';
 import {BundleAnalyzerPlugin} from 'webpack-bundle-analyzer';
 import merge from 'webpack-merge';
 import {load, loadContext, type LoadContextOptions} from '../server';
 import {handleBrokenLinks} from '../server/brokenLinks';
 
-import type {Props} from '@docusaurus/types';
 import createClientConfig from '../webpack/client';
 import createServerConfig from '../webpack/server';
 import {
@@ -26,8 +25,9 @@ import {
 } from '../webpack/utils';
 import CleanWebpackPlugin from '../webpack/plugins/CleanWebpackPlugin';
 import {loadI18n} from '../server/i18n';
-import {mapAsyncSequential} from '@docusaurus/utils';
 import type {HelmetServerState} from 'react-helmet-async';
+import type {Configuration} from 'webpack';
+import type {Props} from '@docusaurus/types';
 
 export type BuildCLIOptions = Pick<
   LoadContextOptions,
diff --git a/packages/docusaurus/src/commands/deploy.ts b/packages/docusaurus/src/commands/deploy.ts
index 485c394004..e35783ddb7 100644
--- a/packages/docusaurus/src/commands/deploy.ts
+++ b/packages/docusaurus/src/commands/deploy.ts
@@ -6,13 +6,13 @@
  */
 
 import fs from 'fs-extra';
-import shell from 'shelljs';
+import path from 'path';
+import os from 'os';
 import logger from '@docusaurus/logger';
+import shell from 'shelljs';
 import {hasSSHProtocol, buildSshUrl, buildHttpsUrl} from '@docusaurus/utils';
 import {loadContext, type LoadContextOptions} from '../server';
 import {build} from './build';
-import path from 'path';
-import os from 'os';
 
 export type DeployCLIOptions = Pick<
   LoadContextOptions,
diff --git a/packages/docusaurus/src/commands/external.ts b/packages/docusaurus/src/commands/external.ts
index eb8c1b94f2..2a9f67ee28 100644
--- a/packages/docusaurus/src/commands/external.ts
+++ b/packages/docusaurus/src/commands/external.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {CommanderStatic} from 'commander';
 import {loadContext} from '../server';
 import {initPlugins} from '../server/plugins/init';
+import type {CommanderStatic} from 'commander';
 
 export async function externalCommand(
   cli: CommanderStatic,
diff --git a/packages/docusaurus/src/commands/serve.ts b/packages/docusaurus/src/commands/serve.ts
index 044bd04ee6..da94dc8667 100644
--- a/packages/docusaurus/src/commands/serve.ts
+++ b/packages/docusaurus/src/commands/serve.ts
@@ -6,14 +6,14 @@
  */
 
 import http from 'http';
-import serveHandler from 'serve-handler';
-import logger from '@docusaurus/logger';
 import path from 'path';
-import type {LoadContextOptions} from '../server';
+import logger from '@docusaurus/logger';
+import {DEFAULT_BUILD_DIR_NAME} from '@docusaurus/utils';
+import serveHandler from 'serve-handler';
 import {loadSiteConfig} from '../server/config';
 import {build} from './build';
 import {getHostPort, type HostPortOptions} from '../server/getHostPort';
-import {DEFAULT_BUILD_DIR_NAME} from '@docusaurus/utils';
+import type {LoadContextOptions} from '../server';
 
 export type ServeCLIOptions = HostPortOptions &
   Pick<LoadContextOptions, 'config'> & {
diff --git a/packages/docusaurus/src/commands/start.ts b/packages/docusaurus/src/commands/start.ts
index 8dee778891..551bca65cc 100644
--- a/packages/docusaurus/src/commands/start.ts
+++ b/packages/docusaurus/src/commands/start.ts
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {normalizeUrl, posixPath} from '@docusaurus/utils';
-import logger from '@docusaurus/logger';
-import chokidar from 'chokidar';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
 import path from 'path';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import {normalizeUrl, posixPath} from '@docusaurus/utils';
+import chokidar from 'chokidar';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
 import openBrowser from 'react-dev-utils/openBrowser';
 import {prepareUrls} from 'react-dev-utils/WebpackDevServerUtils';
 import evalSourceMapMiddleware from 'react-dev-utils/evalSourceMapMiddleware';
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap
index 3483ffb8a4..2608fd7671 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap
@@ -44,8 +44,8 @@ export default function FirstLevelComponentWrapper(props) {
 
 exports[`wrap TypeScript wrap ComponentInFolder 2`] = `
 "import React, {ComponentProps} from 'react';
-import type ComponentInFolderType from '@theme/ComponentInFolder';
 import ComponentInFolder from '@theme-original/ComponentInFolder';
+import type ComponentInFolderType from '@theme/ComponentInFolder';
 
 type Props = ComponentProps<typeof ComponentInFolderType>;
 
@@ -61,8 +61,8 @@ export default function ComponentInFolderWrapper(props: Props): JSX.Element {
 
 exports[`wrap TypeScript wrap ComponentInFolder/ComponentInSubFolder 2`] = `
 "import React, {ComponentProps} from 'react';
-import type ComponentInSubFolderType from '@theme/ComponentInFolder/ComponentInSubFolder';
 import ComponentInSubFolder from '@theme-original/ComponentInFolder/ComponentInSubFolder';
+import type ComponentInSubFolderType from '@theme/ComponentInFolder/ComponentInSubFolder';
 
 type Props = ComponentProps<typeof ComponentInSubFolderType>;
 
@@ -78,8 +78,8 @@ export default function ComponentInSubFolderWrapper(props: Props): JSX.Element {
 
 exports[`wrap TypeScript wrap FirstLevelComponent 2`] = `
 "import React, {ComponentProps} from 'react';
-import type FirstLevelComponentType from '@theme/FirstLevelComponent';
 import FirstLevelComponent from '@theme-original/FirstLevelComponent';
+import type FirstLevelComponentType from '@theme/FirstLevelComponent';
 
 type Props = ComponentProps<typeof FirstLevelComponentType>;
 
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap
index 84e98d772a..a686e30fae 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap
@@ -274,8 +274,8 @@ exports[`swizzle wrap ComponentInFolder JS: theme dir tree 1`] = `
 
 exports[`swizzle wrap ComponentInFolder TS: ComponentInFolder/index.tsx 1`] = `
 "import React, {ComponentProps} from 'react';
-import type ComponentInFolderType from '@theme/ComponentInFolder';
 import ComponentInFolder from '@theme-original/ComponentInFolder';
+import type ComponentInFolderType from '@theme/ComponentInFolder';
 
 type Props = ComponentProps<typeof ComponentInFolderType>;
 
@@ -318,8 +318,8 @@ exports[`swizzle wrap ComponentInFolder/ComponentInSubFolder JS: theme dir tree
 
 exports[`swizzle wrap ComponentInFolder/ComponentInSubFolder TS: ComponentInFolder/ComponentInSubFolder/index.tsx 1`] = `
 "import React, {ComponentProps} from 'react';
-import type ComponentInSubFolderType from '@theme/ComponentInFolder/ComponentInSubFolder';
 import ComponentInSubFolder from '@theme-original/ComponentInFolder/ComponentInSubFolder';
+import type ComponentInSubFolderType from '@theme/ComponentInFolder/ComponentInSubFolder';
 
 type Props = ComponentProps<typeof ComponentInSubFolderType>;
 
@@ -362,8 +362,8 @@ exports[`swizzle wrap ComponentInFolder/Sibling JS: theme dir tree 1`] = `
 
 exports[`swizzle wrap ComponentInFolder/Sibling TS: ComponentInFolder/Sibling.tsx 1`] = `
 "import React, {ComponentProps} from 'react';
-import type SiblingType from '@theme/ComponentInFolder/Sibling';
 import Sibling from '@theme-original/ComponentInFolder/Sibling';
+import type SiblingType from '@theme/ComponentInFolder/Sibling';
 
 type Props = ComponentProps<typeof SiblingType>;
 
@@ -404,8 +404,8 @@ exports[`swizzle wrap FirstLevelComponent JS: theme dir tree 1`] = `
 
 exports[`swizzle wrap FirstLevelComponent TS: FirstLevelComponent.tsx 1`] = `
 "import React, {ComponentProps} from 'react';
-import type FirstLevelComponentType from '@theme/FirstLevelComponent';
 import FirstLevelComponent from '@theme-original/FirstLevelComponent';
+import type FirstLevelComponentType from '@theme/FirstLevelComponent';
 
 type Props = ComponentProps<typeof FirstLevelComponentType>;
 
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts
index d735210761..d732805530 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/actions.test.ts
@@ -7,11 +7,11 @@
 
 import path from 'path';
 import fs from 'fs-extra';
+import tree from 'tree-node-cli';
+import {posixPath} from '@docusaurus/utils';
+import {eject, wrap} from '../actions';
 import {ThemePath, Components, createTempSiteDir} from './testUtils';
 import type {SwizzleAction} from '@docusaurus/types';
-import tree from 'tree-node-cli';
-import {eject, wrap} from '../actions';
-import {posixPath} from '@docusaurus/utils';
 
 // Use relative paths and sort files for tests
 function stableCreatedFiles(
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/components.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/components.test.ts
index eb0b284457..c16a7a0d61 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/components.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/components.test.ts
@@ -7,8 +7,8 @@
 
 import path from 'path';
 import {getThemeComponents, readComponentNames} from '../components';
-import type {SwizzleConfig} from '@docusaurus/types';
 import {Components} from './testUtils';
+import type {SwizzleConfig} from '@docusaurus/types';
 
 const FixtureThemePath = path.join(__dirname, '__fixtures__/theme');
 
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts
index 7dd867a082..cb924a626f 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/config.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {SwizzleConfig} from '@docusaurus/types';
 import {normalizeSwizzleConfig} from '../config';
+import type {SwizzleConfig} from '@docusaurus/types';
 
 describe('normalizeSwizzleConfig', () => {
   it(`validate no components config`, async () => {
diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts b/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
index 0f55edac83..c2317cb41c 100644
--- a/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
+++ b/packages/docusaurus/src/commands/swizzle/__tests__/index.test.ts
@@ -8,10 +8,10 @@
 import {jest} from '@jest/globals';
 import path from 'path';
 import fs from 'fs-extra';
-import {ThemePath, createTempSiteDir, Components} from './testUtils';
 import tree from 'tree-node-cli';
-import {swizzle} from '../index';
 import {escapePath, Globby, posixPath} from '@docusaurus/utils';
+import {ThemePath, createTempSiteDir, Components} from './testUtils';
+import {swizzle} from '../index';
 
 const FixtureThemeName = 'fixture-theme-name';
 
diff --git a/packages/docusaurus/src/commands/swizzle/actions.ts b/packages/docusaurus/src/commands/swizzle/actions.ts
index d6be9f9027..e295f8c2bd 100644
--- a/packages/docusaurus/src/commands/swizzle/actions.ts
+++ b/packages/docusaurus/src/commands/swizzle/actions.ts
@@ -5,14 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import fs from 'fs-extra';
 import path from 'path';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
 import {Globby, posixPath, THEME_PATH} from '@docusaurus/utils';
+import {askSwizzleAction} from './prompts';
 import type {SwizzleAction, SwizzleComponentConfig} from '@docusaurus/types';
 import type {SwizzleCLIOptions} from './common';
-import {askSwizzleAction} from './prompts';
 
 export const SwizzleActions: SwizzleAction[] = ['wrap', 'eject'];
 
@@ -122,8 +122,8 @@ export async function wrap({
 
   const content = typescript
     ? `import React, {ComponentProps} from 'react';
-import type ${componentName}Type from '@theme/${themeComponentName}';
 import ${componentName} from '@theme-${importType}/${themeComponentName}';
+import type ${componentName}Type from '@theme/${themeComponentName}';
 
 type Props = ComponentProps<typeof ${componentName}Type>;
 
diff --git a/packages/docusaurus/src/commands/swizzle/common.ts b/packages/docusaurus/src/commands/swizzle/common.ts
index 4fdf01e4f2..fad472d6b1 100644
--- a/packages/docusaurus/src/commands/swizzle/common.ts
+++ b/packages/docusaurus/src/commands/swizzle/common.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import leven from 'leven';
 import _ from 'lodash';
 import logger from '@docusaurus/logger';
+import leven from 'leven';
 import type {NormalizedPluginConfig} from '../../server/plugins/configs';
 import type {
   InitializedPlugin,
diff --git a/packages/docusaurus/src/commands/swizzle/components.ts b/packages/docusaurus/src/commands/swizzle/components.ts
index f9dc0d7beb..9475ce33db 100644
--- a/packages/docusaurus/src/commands/swizzle/components.ts
+++ b/packages/docusaurus/src/commands/swizzle/components.ts
@@ -5,21 +5,21 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import fs from 'fs-extra';
 import path from 'path';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import {posixPath} from '@docusaurus/utils';
+import {askComponentName} from './prompts';
+import {findClosestValue, findStringIgnoringCase} from './common';
+import {helpTables, themeComponentsTable} from './tables';
+import {SwizzleActions} from './actions';
 import type {
   SwizzleAction,
   SwizzleActionStatus,
   SwizzleComponentConfig,
   SwizzleConfig,
 } from '@docusaurus/types';
-import {posixPath} from '@docusaurus/utils';
-import {askComponentName} from './prompts';
-import {findClosestValue, findStringIgnoringCase} from './common';
-import {helpTables, themeComponentsTable} from './tables';
-import {SwizzleActions} from './actions';
 
 export type ThemeComponents = {
   themeName: string;
diff --git a/packages/docusaurus/src/commands/swizzle/config.ts b/packages/docusaurus/src/commands/swizzle/config.ts
index f62b0ad795..83f0bbe751 100644
--- a/packages/docusaurus/src/commands/swizzle/config.ts
+++ b/packages/docusaurus/src/commands/swizzle/config.ts
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import logger from '@docusaurus/logger';
 import {Joi} from '@docusaurus/utils-validation';
-import type {SwizzleComponentConfig, SwizzleConfig} from '@docusaurus/types';
-import type {SwizzlePlugin} from './common';
 import {SwizzleActions, SwizzleActionsStatuses} from './common';
 import {getPluginByThemeName} from './themes';
-import logger from '@docusaurus/logger';
+import type {SwizzleComponentConfig, SwizzleConfig} from '@docusaurus/types';
+import type {SwizzlePlugin} from './common';
 
 function getModuleSwizzleConfig(
   swizzlePlugin: SwizzlePlugin,
diff --git a/packages/docusaurus/src/commands/swizzle/index.ts b/packages/docusaurus/src/commands/swizzle/index.ts
index 0d13d7387a..9262e7d154 100644
--- a/packages/docusaurus/src/commands/swizzle/index.ts
+++ b/packages/docusaurus/src/commands/swizzle/index.ts
@@ -9,14 +9,14 @@ import logger from '@docusaurus/logger';
 import {getThemeName, getThemePath, getThemeNames} from './themes';
 import {getThemeComponents, getComponentName} from './components';
 import {helpTables, themeComponentsTable} from './tables';
-import type {SwizzleAction, SwizzleComponentConfig} from '@docusaurus/types';
-import type {SwizzleCLIOptions, SwizzlePlugin} from './common';
 import {normalizeOptions} from './common';
-import type {ActionResult} from './actions';
 import {eject, getAction, wrap} from './actions';
 import {getThemeSwizzleConfig} from './config';
 import {askSwizzleDangerousComponent} from './prompts';
 import {initSwizzleContext} from './context';
+import type {SwizzleAction, SwizzleComponentConfig} from '@docusaurus/types';
+import type {SwizzleCLIOptions, SwizzlePlugin} from './common';
+import type {ActionResult} from './actions';
 
 async function listAllThemeComponents({
   themeNames,
diff --git a/packages/docusaurus/src/commands/swizzle/prompts.ts b/packages/docusaurus/src/commands/swizzle/prompts.ts
index fb6ab4f13d..6aa1d1e0e9 100644
--- a/packages/docusaurus/src/commands/swizzle/prompts.ts
+++ b/packages/docusaurus/src/commands/swizzle/prompts.ts
@@ -7,9 +7,9 @@
 
 import logger from '@docusaurus/logger';
 import prompts from 'prompts';
+import {actionStatusSuffix, PartiallySafeHint} from './common';
 import type {ThemeComponents} from './components';
 import type {SwizzleAction, SwizzleComponentConfig} from '@docusaurus/types';
-import {actionStatusSuffix, PartiallySafeHint} from './common';
 
 const ExitTitle = logger.yellow('[Exit]');
 
diff --git a/packages/docusaurus/src/commands/swizzle/tables.ts b/packages/docusaurus/src/commands/swizzle/tables.ts
index 28b9b5188b..73ccf077d8 100644
--- a/packages/docusaurus/src/commands/swizzle/tables.ts
+++ b/packages/docusaurus/src/commands/swizzle/tables.ts
@@ -5,13 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
 import logger from '@docusaurus/logger';
 import Table from 'cli-table3';
-import _ from 'lodash';
-import type {ThemeComponents} from './components';
 import {SwizzleActions} from './actions';
-import type {SwizzleActionStatus} from '@docusaurus/types';
 import {actionStatusColor, actionStatusLabel} from './common';
+import type {SwizzleActionStatus} from '@docusaurus/types';
+import type {ThemeComponents} from './components';
 
 function tableStatusLabel(status: SwizzleActionStatus): string {
   return actionStatusColor(status, actionStatusLabel(status));
diff --git a/packages/docusaurus/src/commands/swizzle/themes.ts b/packages/docusaurus/src/commands/swizzle/themes.ts
index 49381089dd..c31b0f28dd 100644
--- a/packages/docusaurus/src/commands/swizzle/themes.ts
+++ b/packages/docusaurus/src/commands/swizzle/themes.ts
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import path from 'path';
-import leven from 'leven';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
+import leven from 'leven';
 import {askThemeName} from './prompts';
 import {findStringIgnoringCase, type SwizzlePlugin} from './common';
 
diff --git a/packages/docusaurus/src/commands/writeTranslations.ts b/packages/docusaurus/src/commands/writeTranslations.ts
index 606c8447d6..14ae1e64ad 100644
--- a/packages/docusaurus/src/commands/writeTranslations.ts
+++ b/packages/docusaurus/src/commands/writeTranslations.ts
@@ -5,11 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {InitializedPlugin} from '@docusaurus/types';
 import path from 'path';
 import {loadContext, type LoadContextOptions} from '../server';
 import {initPlugins} from '../server/plugins/init';
-
 import {
   writePluginTranslations,
   writeCodeTranslations,
@@ -22,6 +20,7 @@ import {
   globSourceCodeFilePaths,
 } from '../server/translations/translationsExtractor';
 import {getCustomBabelConfigFilePath, getBabelOptions} from '../webpack/utils';
+import type {InitializedPlugin} from '@docusaurus/types';
 
 export type WriteTranslationsCLIOptions = Pick<
   LoadContextOptions,
diff --git a/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts b/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts
index d33e301382..30a40bb752 100644
--- a/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts
+++ b/packages/docusaurus/src/server/__tests__/siteMetadata.test.ts
@@ -6,8 +6,8 @@
  */
 
 import {jest} from '@jest/globals';
-import {getPluginVersion, loadSiteMetadata} from '../siteMetadata';
 import path from 'path';
+import {getPluginVersion, loadSiteMetadata} from '../siteMetadata';
 
 describe('getPluginVersion', () => {
   it('detects external packages plugins versions', async () => {
diff --git a/packages/docusaurus/src/server/__tests__/utils.test.ts b/packages/docusaurus/src/server/__tests__/utils.test.ts
index b8ef5b59fa..6466573505 100644
--- a/packages/docusaurus/src/server/__tests__/utils.test.ts
+++ b/packages/docusaurus/src/server/__tests__/utils.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {RouteConfig} from '@docusaurus/types';
 import {getAllFinalRoutes} from '../utils';
+import type {RouteConfig} from '@docusaurus/types';
 
 describe('getAllFinalRoutes', () => {
   it('gets final routes correctly', () => {
diff --git a/packages/docusaurus/src/server/brokenLinks.ts b/packages/docusaurus/src/server/brokenLinks.ts
index 4ce32b2dea..22f466772d 100644
--- a/packages/docusaurus/src/server/brokenLinks.ts
+++ b/packages/docusaurus/src/server/brokenLinks.ts
@@ -5,10 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {matchRoutes} from 'react-router-config';
 import fs from 'fs-extra';
+import path from 'path';
 import _ from 'lodash';
-import type {RouteConfig, ReportingSeverity} from '@docusaurus/types';
+import logger from '@docusaurus/logger';
+import combinePromises from 'combine-promises';
+import {matchRoutes} from 'react-router-config';
 import {
   removePrefix,
   removeSuffix,
@@ -16,9 +18,7 @@ import {
   resolvePathname,
 } from '@docusaurus/utils';
 import {getAllFinalRoutes} from './utils';
-import path from 'path';
-import combinePromises from 'combine-promises';
-import logger from '@docusaurus/logger';
+import type {RouteConfig, ReportingSeverity} from '@docusaurus/types';
 
 type BrokenLink = {
   link: string;
diff --git a/packages/docusaurus/src/server/config.ts b/packages/docusaurus/src/server/config.ts
index 84b4975f12..13ab71215c 100644
--- a/packages/docusaurus/src/server/config.ts
+++ b/packages/docusaurus/src/server/config.ts
@@ -9,8 +9,8 @@ import path from 'path';
 import fs from 'fs-extra';
 import importFresh from 'import-fresh';
 import {DEFAULT_CONFIG_FILE_NAME} from '@docusaurus/utils';
-import type {LoadContext} from '@docusaurus/types';
 import {validateConfig} from './configValidation';
+import type {LoadContext} from '@docusaurus/types';
 
 export async function loadSiteConfig({
   siteDir,
diff --git a/packages/docusaurus/src/server/configValidation.ts b/packages/docusaurus/src/server/configValidation.ts
index f8a0985903..d1c009ae66 100644
--- a/packages/docusaurus/src/server/configValidation.ts
+++ b/packages/docusaurus/src/server/configValidation.ts
@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {DocusaurusConfig, I18nConfig} from '@docusaurus/types';
 import {
   DEFAULT_CONFIG_FILE_NAME,
   DEFAULT_STATIC_DIR_NAME,
 } from '@docusaurus/utils';
 import {Joi, URISchema, printWarning} from '@docusaurus/utils-validation';
+import type {DocusaurusConfig, I18nConfig} from '@docusaurus/types';
 
 const DEFAULT_I18N_LOCALE = 'en';
 
diff --git a/packages/docusaurus/src/server/getHostPort.ts b/packages/docusaurus/src/server/getHostPort.ts
index c9792a45ec..40960bdfff 100644
--- a/packages/docusaurus/src/server/getHostPort.ts
+++ b/packages/docusaurus/src/server/getHostPort.ts
@@ -6,8 +6,8 @@
  */
 
 import {execSync, type ExecSyncOptionsWithStringEncoding} from 'child_process';
-import detect from 'detect-port';
 import logger from '@docusaurus/logger';
+import detect from 'detect-port';
 import {DEFAULT_PORT} from '@docusaurus/utils';
 import prompts from 'prompts';
 
diff --git a/packages/docusaurus/src/server/htmlTags.ts b/packages/docusaurus/src/server/htmlTags.ts
index c1e67b23c1..81cce41635 100644
--- a/packages/docusaurus/src/server/htmlTags.ts
+++ b/packages/docusaurus/src/server/htmlTags.ts
@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import _ from 'lodash';
 import htmlTags from 'html-tags';
 import voidHtmlTags from 'html-tags/void';
 import escapeHTML from 'escape-html';
-import _ from 'lodash';
 import type {
   Props,
   HtmlTagObject,
diff --git a/packages/docusaurus/src/server/i18n.ts b/packages/docusaurus/src/server/i18n.ts
index 57f639c140..cd9bbe4990 100644
--- a/packages/docusaurus/src/server/i18n.ts
+++ b/packages/docusaurus/src/server/i18n.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {getLangDir} from 'rtl-detect';
 import logger from '@docusaurus/logger';
+import {getLangDir} from 'rtl-detect';
 import type {I18n, DocusaurusConfig, I18nLocaleConfig} from '@docusaurus/types';
 import type {LoadContextOptions} from './index';
 
diff --git a/packages/docusaurus/src/server/index.ts b/packages/docusaurus/src/server/index.ts
index 55b2466d11..4417f0f7f5 100644
--- a/packages/docusaurus/src/server/index.ts
+++ b/packages/docusaurus/src/server/index.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import path from 'path';
+import _ from 'lodash';
 import {
   generate,
   escapePath,
@@ -13,8 +15,6 @@ import {
   DEFAULT_CONFIG_FILE_NAME,
   GENERATED_FILES_DIR_NAME,
 } from '@docusaurus/utils';
-import _ from 'lodash';
-import path from 'path';
 import {loadSiteConfig} from './config';
 import {loadClientModules} from './clientModules';
 import {loadPlugins} from './plugins';
diff --git a/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts b/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts
index 0c04a3fc03..a6315f59a8 100644
--- a/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts
+++ b/packages/docusaurus/src/server/plugins/__tests__/pluginIds.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {InitializedPlugin} from '@docusaurus/types';
 import {ensureUniquePluginInstanceIds} from '../pluginIds';
+import type {InitializedPlugin} from '@docusaurus/types';
 
 function createTestPlugin(name: string, id?: string): InitializedPlugin {
   // @ts-expect-error: good enough for tests
diff --git a/packages/docusaurus/src/server/plugins/index.ts b/packages/docusaurus/src/server/plugins/index.ts
index 93553d1820..812ea7b2e8 100644
--- a/packages/docusaurus/src/server/plugins/index.ts
+++ b/packages/docusaurus/src/server/plugins/index.ts
@@ -5,8 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {docuHash, generate} from '@docusaurus/utils';
 import path from 'path';
+import _ from 'lodash';
+import {docuHash, generate} from '@docusaurus/utils';
+import {initPlugins} from './init';
+import {createBootstrapPlugin, createMDXFallbackPlugin} from './synthetic';
+import {localizePluginTranslationFile} from '../translations/translations';
+import {applyRouteTrailingSlash, sortConfig} from './routeConfig';
 import type {
   LoadContext,
   PluginContentLoadedActions,
@@ -17,11 +22,6 @@ import type {
   InitializedPlugin,
   PluginRouteContext,
 } from '@docusaurus/types';
-import {initPlugins} from './init';
-import {createBootstrapPlugin, createMDXFallbackPlugin} from './synthetic';
-import _ from 'lodash';
-import {localizePluginTranslationFile} from '../translations/translations';
-import {applyRouteTrailingSlash, sortConfig} from './routeConfig';
 
 /**
  * Initializes the plugins, runs `loadContent`, `translateContent`,
diff --git a/packages/docusaurus/src/server/plugins/init.ts b/packages/docusaurus/src/server/plugins/init.ts
index 4bc0aa92da..771a407ccc 100644
--- a/packages/docusaurus/src/server/plugins/init.ts
+++ b/packages/docusaurus/src/server/plugins/init.ts
@@ -7,6 +7,14 @@
 
 import {createRequire} from 'module';
 import path from 'path';
+import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
+import {
+  normalizePluginOptions,
+  normalizeThemeConfig,
+} from '@docusaurus/utils-validation';
+import {getPluginVersion} from '../siteMetadata';
+import {ensureUniquePluginInstanceIds} from './pluginIds';
+import {loadPluginConfigs, type NormalizedPluginConfig} from './configs';
 import type {
   PluginVersionInformation,
   LoadContext,
@@ -14,14 +22,6 @@ import type {
   PluginOptions,
   InitializedPlugin,
 } from '@docusaurus/types';
-import {DEFAULT_PLUGIN_ID} from '@docusaurus/utils';
-import {getPluginVersion} from '../siteMetadata';
-import {ensureUniquePluginInstanceIds} from './pluginIds';
-import {
-  normalizePluginOptions,
-  normalizeThemeConfig,
-} from '@docusaurus/utils-validation';
-import {loadPluginConfigs, type NormalizedPluginConfig} from './configs';
 
 function getOptionValidationFunction(
   normalizedPluginConfig: NormalizedPluginConfig,
diff --git a/packages/docusaurus/src/server/plugins/presets.ts b/packages/docusaurus/src/server/plugins/presets.ts
index b45b06915b..04b73357f3 100644
--- a/packages/docusaurus/src/server/plugins/presets.ts
+++ b/packages/docusaurus/src/server/plugins/presets.ts
@@ -7,13 +7,13 @@
 
 import {createRequire} from 'module';
 import importFresh from 'import-fresh';
+import {resolveModuleName} from './moduleShorthand';
 import type {
   LoadContext,
   PluginConfig,
   PresetModule,
   DocusaurusConfig,
 } from '@docusaurus/types';
-import {resolveModuleName} from './moduleShorthand';
 
 type ImportedPresetModule = PresetModule & {default?: PresetModule};
 
diff --git a/packages/docusaurus/src/server/plugins/routeConfig.ts b/packages/docusaurus/src/server/plugins/routeConfig.ts
index e5664dd169..e9b7c58940 100644
--- a/packages/docusaurus/src/server/plugins/routeConfig.ts
+++ b/packages/docusaurus/src/server/plugins/routeConfig.ts
@@ -5,11 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {RouteConfig} from '@docusaurus/types';
 import {
   applyTrailingSlash,
   type ApplyTrailingSlashParams,
 } from '@docusaurus/utils-common';
+import type {RouteConfig} from '@docusaurus/types';
 
 /** Recursively applies trailing slash config to all nested routes. */
 export function applyRouteTrailingSlash(
diff --git a/packages/docusaurus/src/server/routes.ts b/packages/docusaurus/src/server/routes.ts
index 87cfedf87a..ab97b1a7b9 100644
--- a/packages/docusaurus/src/server/routes.ts
+++ b/packages/docusaurus/src/server/routes.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import query from 'querystring';
+import _ from 'lodash';
 import {
   docuHash,
   normalizeUrl,
@@ -12,8 +14,6 @@ import {
   escapePath,
   reportMessage,
 } from '@docusaurus/utils';
-import _ from 'lodash';
-import query from 'querystring';
 import {getAllFinalRoutes} from './utils';
 import type {
   Module,
diff --git a/packages/docusaurus/src/server/siteMetadata.ts b/packages/docusaurus/src/server/siteMetadata.ts
index bde32ad967..b442eed152 100644
--- a/packages/docusaurus/src/server/siteMetadata.ts
+++ b/packages/docusaurus/src/server/siteMetadata.ts
@@ -5,15 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import fs from 'fs-extra';
+import path from 'path';
+import logger from '@docusaurus/logger';
+import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
 import type {
   LoadedPlugin,
   PluginVersionInformation,
   SiteMetadata,
 } from '@docusaurus/types';
-import {DOCUSAURUS_VERSION} from '@docusaurus/utils';
-import fs from 'fs-extra';
-import path from 'path';
-import logger from '@docusaurus/logger';
 
 async function getPackageJsonVersion(
   packageJsonPath: string,
diff --git a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
index 89240e3ea0..f34318cd47 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translations.test.ts
@@ -6,6 +6,9 @@
  */
 
 import {jest} from '@jest/globals';
+import fs from 'fs-extra';
+import path from 'path';
+import tmp from 'tmp-promise';
 import {
   writePluginTranslations,
   writeCodeTranslations,
@@ -15,14 +18,11 @@ import {
   getPluginsDefaultCodeTranslationMessages,
   applyDefaultCodeTranslations,
 } from '../translations';
-import fs from 'fs-extra';
-import tmp from 'tmp-promise';
 import type {
   InitializedPlugin,
   TranslationFile,
   TranslationFileContent,
 } from '@docusaurus/types';
-import path from 'path';
 
 async function createTmpSiteDir() {
   const {path: siteDirPath} = await tmp.dir({
diff --git a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
index 5b80021d70..e06bc5f57d 100644
--- a/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
+++ b/packages/docusaurus/src/server/translations/__tests__/translationsExtractor.test.ts
@@ -6,16 +6,16 @@
  */
 
 import {jest} from '@jest/globals';
+import path from 'path';
 import fs from 'fs-extra';
 import tmp from 'tmp-promise';
+import {SRC_DIR_NAME} from '@docusaurus/utils';
 import {
   extractSourceCodeFileTranslations,
   extractSiteSourceCodeTranslations,
 } from '../translationsExtractor';
 import {getBabelOptions} from '../../../webpack/utils';
-import path from 'path';
 import type {InitializedPlugin} from '@docusaurus/types';
-import {SRC_DIR_NAME} from '@docusaurus/utils';
 
 const TestBabelOptions = getBabelOptions({
   isServer: true,
diff --git a/packages/docusaurus/src/server/translations/translations.ts b/packages/docusaurus/src/server/translations/translations.ts
index 3e768b8a90..fcbe5f5e11 100644
--- a/packages/docusaurus/src/server/translations/translations.ts
+++ b/packages/docusaurus/src/server/translations/translations.ts
@@ -8,6 +8,7 @@
 import path from 'path';
 import fs from 'fs-extra';
 import _ from 'lodash';
+import logger from '@docusaurus/logger';
 import {
   getPluginI18nPath,
   toMessageRelativeFilePath,
@@ -15,7 +16,6 @@ import {
   CODE_TRANSLATIONS_FILE_NAME,
 } from '@docusaurus/utils';
 import {Joi} from '@docusaurus/utils-validation';
-import logger from '@docusaurus/logger';
 import type {
   TranslationFileContent,
   TranslationFile,
diff --git a/packages/docusaurus/src/server/translations/translationsExtractor.ts b/packages/docusaurus/src/server/translations/translationsExtractor.ts
index 73a1a0cbfe..569c3314b1 100644
--- a/packages/docusaurus/src/server/translations/translationsExtractor.ts
+++ b/packages/docusaurus/src/server/translations/translationsExtractor.ts
@@ -5,23 +5,23 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import nodePath from 'path';
 import fs from 'fs-extra';
+import logger from '@docusaurus/logger';
 import traverse, {type Node} from '@babel/traverse';
 import generate from '@babel/generator';
-import logger from '@docusaurus/logger';
 import {
   parse,
   type types as t,
   type NodePath,
   type TransformOptions,
 } from '@babel/core';
+import {SRC_DIR_NAME} from '@docusaurus/utils';
+import {safeGlobby} from '../utils';
 import type {
   InitializedPlugin,
   TranslationFileContent,
 } from '@docusaurus/types';
-import nodePath from 'path';
-import {SRC_DIR_NAME} from '@docusaurus/utils';
-import {safeGlobby} from '../utils';
 
 // We only support extracting source code translations from these kind of files
 const TranslatableSourceCodeExtension = new Set([
diff --git a/packages/docusaurus/src/server/utils.ts b/packages/docusaurus/src/server/utils.ts
index e4e22df7d9..e0e67454c7 100644
--- a/packages/docusaurus/src/server/utils.ts
+++ b/packages/docusaurus/src/server/utils.ts
@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import type {RouteConfig} from '@docusaurus/types';
 import path from 'path';
 import {posixPath, Globby} from '@docusaurus/utils';
+import type {RouteConfig} from '@docusaurus/types';
 
 // Recursively get the final routes (routes with no subroutes)
 export function getAllFinalRoutes(routeConfig: RouteConfig[]): RouteConfig[] {
diff --git a/packages/docusaurus/src/webpack/__tests__/base.test.ts b/packages/docusaurus/src/webpack/__tests__/base.test.ts
index 93b1de8c19..3e39adfda4 100644
--- a/packages/docusaurus/src/webpack/__tests__/base.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/base.test.ts
@@ -7,11 +7,10 @@
 
 import {jest} from '@jest/globals';
 import path from 'path';
-
-import {excludeJS, clientDir, createBaseConfig} from '../base';
+import _ from 'lodash';
 import * as utils from '@docusaurus/utils/lib/webpackUtils';
 import {posixPath} from '@docusaurus/utils';
-import _ from 'lodash';
+import {excludeJS, clientDir, createBaseConfig} from '../base';
 import type {Props} from '@docusaurus/types';
 
 describe('babel transpilation exclude logic', () => {
diff --git a/packages/docusaurus/src/webpack/__tests__/utils.test.ts b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
index 664679e3f6..411ed91804 100644
--- a/packages/docusaurus/src/webpack/__tests__/utils.test.ts
+++ b/packages/docusaurus/src/webpack/__tests__/utils.test.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import webpack, {type Configuration, type RuleSetRule} from 'webpack';
 import path from 'path';
+import webpack, {type Configuration, type RuleSetRule} from 'webpack';
 
 import {
   getCustomizableJSLoader,
diff --git a/packages/docusaurus/src/webpack/aliases/index.ts b/packages/docusaurus/src/webpack/aliases/index.ts
index b48184b8ab..dbade3a77e 100644
--- a/packages/docusaurus/src/webpack/aliases/index.ts
+++ b/packages/docusaurus/src/webpack/aliases/index.ts
@@ -7,6 +7,7 @@
 
 import fs from 'fs-extra';
 import path from 'path';
+import _ from 'lodash';
 import {
   THEME_PATH,
   fileToPath,
@@ -14,7 +15,6 @@ import {
   normalizeUrl,
   Globby,
 } from '@docusaurus/utils';
-import _ from 'lodash';
 import type {LoadedPlugin} from '@docusaurus/types';
 
 /**
diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index 45a81c1031..4e00fecefa 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -6,10 +6,9 @@
  */
 
 import fs from 'fs-extra';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import path from 'path';
-import type {Configuration} from 'webpack';
-import type {Props} from '@docusaurus/types';
+import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import {md5Hash, getFileLoaderUtils} from '@docusaurus/utils';
 import {
   getCustomizableJSLoader,
   getStyleLoaders,
@@ -17,7 +16,8 @@ import {
   getMinimizer,
 } from './utils';
 import {loadThemeAliases, loadDocusaurusAliases} from './aliases';
-import {md5Hash, getFileLoaderUtils} from '@docusaurus/utils';
+import type {Configuration} from 'webpack';
+import type {Props} from '@docusaurus/types';
 
 const CSS_REGEX = /\.css$/i;
 const CSS_MODULE_REGEX = /\.module\.css$/i;
diff --git a/packages/docusaurus/src/webpack/client.ts b/packages/docusaurus/src/webpack/client.ts
index f7ca7de770..cd2d59720a 100644
--- a/packages/docusaurus/src/webpack/client.ts
+++ b/packages/docusaurus/src/webpack/client.ts
@@ -5,15 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import path from 'path';
-import type {Configuration} from 'webpack';
+import logger from '@docusaurus/logger';
 import merge from 'webpack-merge';
-
-import type {Props} from '@docusaurus/types';
 import {createBaseConfig} from './base';
 import ChunkAssetPlugin from './plugins/ChunkAssetPlugin';
 import LogPlugin from './plugins/LogPlugin';
+import type {Props} from '@docusaurus/types';
+import type {Configuration} from 'webpack';
 
 export default async function createClientConfig(
   props: Props,
diff --git a/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts b/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts
index 46b4ca424f..5a8f477010 100644
--- a/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts
+++ b/packages/docusaurus/src/webpack/plugins/CleanWebpackPlugin.ts
@@ -29,9 +29,9 @@
 // Modified to optimize performance for Docusaurus specific use case
 // More context: https://github.com/facebook/docusaurus/pull/1839
 
-import type {Compiler, Stats} from 'webpack';
 import path from 'path';
 import {sync as delSync} from 'del';
+import type {Compiler, Stats} from 'webpack';
 
 export type Options = {
   /**
diff --git a/packages/docusaurus/src/webpack/plugins/LogPlugin.ts b/packages/docusaurus/src/webpack/plugins/LogPlugin.ts
index e8e79b0080..a1703d2bca 100644
--- a/packages/docusaurus/src/webpack/plugins/LogPlugin.ts
+++ b/packages/docusaurus/src/webpack/plugins/LogPlugin.ts
@@ -6,8 +6,8 @@
  */
 
 import WebpackBar from 'webpackbar';
-import type {Compiler} from 'webpack';
 import formatWebpackMessages from 'react-dev-utils/formatWebpackMessages';
+import type {Compiler} from 'webpack';
 
 function showError(arr: string[]) {
   console.log(`\n\n${arr.join('\n')}`);
diff --git a/packages/docusaurus/src/webpack/server.ts b/packages/docusaurus/src/webpack/server.ts
index c0aab9ed99..7f93c86a4b 100644
--- a/packages/docusaurus/src/webpack/server.ts
+++ b/packages/docusaurus/src/webpack/server.ts
@@ -6,24 +6,22 @@
  */
 
 import path from 'path';
-import type {Configuration} from 'webpack';
 import merge from 'webpack-merge';
-
-import type {Props} from '@docusaurus/types';
-import {createBaseConfig} from './base';
-import WaitPlugin from './plugins/WaitPlugin';
-import LogPlugin from './plugins/LogPlugin';
 import {
   NODE_MAJOR_VERSION,
   NODE_MINOR_VERSION,
   DOCUSAURUS_VERSION,
 } from '@docusaurus/utils';
-import ssrDefaultTemplate from './templates/ssr.html.template';
-
 // Forked for Docusaurus: https://github.com/slorber/static-site-generator-webpack-plugin
 import StaticSiteGeneratorPlugin, {
   type Locals,
 } from '@slorber/static-site-generator-webpack-plugin';
+import {createBaseConfig} from './base';
+import WaitPlugin from './plugins/WaitPlugin';
+import LogPlugin from './plugins/LogPlugin';
+import ssrDefaultTemplate from './templates/ssr.html.template';
+import type {Props} from '@docusaurus/types';
+import type {Configuration} from 'webpack';
 
 export default async function createServerConfig({
   props,
diff --git a/packages/docusaurus/src/webpack/utils.ts b/packages/docusaurus/src/webpack/utils.ts
index 8f32ddc277..7936288767 100644
--- a/packages/docusaurus/src/webpack/utils.ts
+++ b/packages/docusaurus/src/webpack/utils.ts
@@ -5,6 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import fs from 'fs-extra';
+import path from 'path';
+import crypto from 'crypto';
+import logger from '@docusaurus/logger';
+import {BABEL_CONFIG_FILE_NAME} from '@docusaurus/utils';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
 import {
   mergeWithCustomize,
@@ -16,20 +21,15 @@ import webpack, {
   type RuleSetRule,
   type WebpackPluginInstance,
 } from 'webpack';
-import fs from 'fs-extra';
 import TerserPlugin from 'terser-webpack-plugin';
-import type {CustomOptions, CssNanoOptions} from 'css-minimizer-webpack-plugin';
 import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
-import path from 'path';
-import crypto from 'crypto';
-import logger from '@docusaurus/logger';
+import type {CustomOptions, CssNanoOptions} from 'css-minimizer-webpack-plugin';
 import type {TransformOptions} from '@babel/core';
 import type {
   Plugin,
   PostCssOptions,
   ConfigureWebpackUtils,
 } from '@docusaurus/types';
-import {BABEL_CONFIG_FILE_NAME} from '@docusaurus/utils';
 
 // Utility method to get style loaders
 export function getStyleLoaders(
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 11cd28a07f..e7b1e4b58c 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -21,7 +21,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@typescript-eslint/utils": "^5.22.0",
+    "@typescript-eslint/utils": "^5.23.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
diff --git a/packages/lqip-loader/src/lqip.ts b/packages/lqip-loader/src/lqip.ts
index b6286872b4..c26956f19e 100644
--- a/packages/lqip-loader/src/lqip.ts
+++ b/packages/lqip-loader/src/lqip.ts
@@ -5,8 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import logger from '@docusaurus/logger';
 import path from 'path';
+import logger from '@docusaurus/logger';
 import sharp from 'sharp';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/packages/stylelint-copyright/__tests__/index.test.js b/packages/stylelint-copyright/__tests__/index.test.js
index 20de7dbae8..d2373e3d99 100644
--- a/packages/stylelint-copyright/__tests__/index.test.js
+++ b/packages/stylelint-copyright/__tests__/index.test.js
@@ -6,8 +6,8 @@
  */
 /* eslint-disable jest/no-conditional-expect */
 
-const stylelint = require('stylelint');
 const path = require('path');
+const stylelint = require('stylelint');
 const rule = require('..');
 
 const {ruleName, messages} = rule;
diff --git a/project-words.txt b/project-words.txt
index 341e85f935..2e029e7f7c 100644
--- a/project-words.txt
+++ b/project-words.txt
@@ -16,6 +16,7 @@ atrule
 autoconverted
 autogen
 autogenerating
+autohide
 backport
 backticks
 bartosz
@@ -152,6 +153,7 @@ marcey
 marocchino
 massoud
 mathjax
+maxresdefault
 mdast
 mdxa
 mdxast
@@ -208,6 +210,7 @@ philpl
 photoshop
 picocolors
 picomatch
+playbtn
 pluggable
 plushie
 pnpm
@@ -267,6 +270,7 @@ sensical
 serializers
 setaf
 setext
+showinfo
 sida
 simen
 slorber
diff --git a/website/_dogfooding/_pages tests/error-boundary-tests.tsx b/website/_dogfooding/_pages tests/error-boundary-tests.tsx
index a669c7f2af..100c7e6c0d 100644
--- a/website/_dogfooding/_pages tests/error-boundary-tests.tsx	
+++ b/website/_dogfooding/_pages tests/error-boundary-tests.tsx	
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import Layout from '@theme/Layout';
 import Interpolate from '@docusaurus/Interpolate';
+import Layout from '@theme/Layout';
 
 import ErrorBoundaryTestButton from '@site/src/components/ErrorBoundaryTestButton';
 
diff --git a/website/_dogfooding/_pages tests/link-tests.tsx b/website/_dogfooding/_pages tests/link-tests.tsx
index d0afa2ef4f..d1c7c44807 100644
--- a/website/_dogfooding/_pages tests/link-tests.tsx	
+++ b/website/_dogfooding/_pages tests/link-tests.tsx	
@@ -6,8 +6,8 @@
  */
 
 import React, {useRef} from 'react';
-import Layout from '@theme/Layout';
 import Link from '@docusaurus/Link';
+import Layout from '@theme/Layout';
 
 export default function LinkTest(): JSX.Element {
   const anchorRef = useRef<HTMLAnchorElement>(null);
diff --git a/website/_dogfooding/_pages tests/markdownPageTests.md b/website/_dogfooding/_pages tests/markdownPageTests.md
index bbd5c90e67..ca7e9fcff7 100644
--- a/website/_dogfooding/_pages tests/markdownPageTests.md	
+++ b/website/_dogfooding/_pages tests/markdownPageTests.md	
@@ -183,3 +183,9 @@ Code tag + double pipe: <code>||</code>
 Details without a summary
 
 </details>
+
+This is a fragment:
+
+<>Hello</>
+
+It should work :)
diff --git a/website/community/Versions.tsx b/website/community/4-canary/Versions.tsx
similarity index 100%
rename from website/community/Versions.tsx
rename to website/community/4-canary/Versions.tsx
index 10e1fdd1ec..a36907b10c 100644
--- a/website/community/Versions.tsx
+++ b/website/community/4-canary/Versions.tsx
@@ -8,8 +8,8 @@
 import React, {useContext, useEffect, useState, type ReactNode} from 'react';
 import {useDocsPreferredVersion} from '@docusaurus/theme-common';
 import {useVersions} from '@docusaurus/plugin-content-docs/client';
-import CodeBlock from '@theme/CodeBlock';
 import Translate from '@docusaurus/Translate';
+import CodeBlock from '@theme/CodeBlock';
 
 type ContextValue = {
   name: string;
diff --git a/website/community/4-canary.md b/website/community/4-canary/index.md
similarity index 100%
rename from website/community/4-canary.md
rename to website/community/4-canary/index.md
diff --git a/website/docs/api/docusaurus.config.js.md b/website/docs/api/docusaurus.config.js.md
index 488fd728c3..9910ddb522 100644
--- a/website/docs/api/docusaurus.config.js.md
+++ b/website/docs/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/docs/api/misc/img/logger-demo.png b/website/docs/api/misc/logger/demo.png
similarity index 100%
rename from website/docs/api/misc/img/logger-demo.png
rename to website/docs/api/misc/logger/demo.png
diff --git a/website/docs/api/misc/logger.md b/website/docs/api/misc/logger/logger.md
similarity index 99%
rename from website/docs/api/misc/logger.md
rename to website/docs/api/misc/logger/logger.md
index 986c4d2880..fb291473dd 100644
--- a/website/docs/api/misc/logger.md
+++ b/website/docs/api/misc/logger/logger.md
@@ -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/docs/deployment.mdx b/website/docs/deployment.mdx
index 9674693bce..23ea588caf 100644
--- a/website/docs/deployment.mdx
+++ b/website/docs/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/docs/introduction.md b/website/docs/introduction.md
index de877f6238..cec5f22c2e 100644
--- a/website/docs/introduction.md
+++ b/website/docs/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/docusaurus.config.js b/website/docusaurus.config.js
index 4c373b359c..6fb03a168d 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -7,14 +7,14 @@
 // @ts-check
 
 const path = require('path');
-const versions = require('./versions.json');
 const math = require('remark-math');
+const npm2yarn = require('@docusaurus/remark-plugin-npm2yarn');
+const versions = require('./versions.json');
 const VersionsArchived = require('./versionsArchived.json');
 const {
   dogfoodingPluginInstances,
   dogfoodingThemeInstances,
 } = require('./_dogfooding/dogfooding.config');
-const npm2yarn = require('@docusaurus/remark-plugin-npm2yarn');
 
 const ArchivedVersionsDropdownItems = Object.entries(VersionsArchived).splice(
   0,
diff --git a/website/package.json b/website/package.json
index fdd3b393cb..ee7a44bc87 100644
--- a/website/package.json
+++ b/website/package.json
@@ -49,7 +49,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.178",
+    "@swc/core": "^1.2.181",
     "clsx": "^1.1.1",
     "color": "^4.2.3",
     "fs-extra": "^10.1.0",
@@ -57,6 +57,7 @@
     "raw-loader": "^4.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-lite-youtube-embed": "^2.2.2",
     "react-medium-image-zoom": "^4.3.7",
     "react-popper": "^2.3.0",
     "rehype-katex": "^6.0.2",
diff --git a/website/src/components/ColorGenerator/index.tsx b/website/src/components/ColorGenerator/index.tsx
index 0ce0d508e3..2fba54627f 100644
--- a/website/src/components/ColorGenerator/index.tsx
+++ b/website/src/components/ColorGenerator/index.tsx
@@ -8,12 +8,11 @@
 import React, {useEffect, useState} from 'react';
 import clsx from 'clsx';
 import Color from 'color';
-import CodeBlock from '@theme/CodeBlock';
-import Admonition from '@theme/Admonition';
 import Link from '@docusaurus/Link';
 import Translate from '@docusaurus/Translate';
 import {useColorMode} from '@docusaurus/theme-common';
-
+import CodeBlock from '@theme/CodeBlock';
+import Admonition from '@theme/Admonition';
 import {
   type ColorState,
   COLOR_SHADES,
diff --git a/website/src/components/Playground/index.tsx b/website/src/components/Playground/index.tsx
index 45c4186fa3..a661c965c2 100644
--- a/website/src/components/Playground/index.tsx
+++ b/website/src/components/Playground/index.tsx
@@ -8,10 +8,10 @@
 /* eslint-disable global-require */
 
 import React from 'react';
+import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
 import Link from '@docusaurus/Link';
 import Image from '@theme/IdealImage';
-import clsx from 'clsx';
 
 const Playgrounds = [
   {
diff --git a/website/src/components/UpgradeGuide/index.tsx b/website/src/components/UpgradeGuide/index.tsx
index 0ba1913aae..01d1131cc9 100644
--- a/website/src/components/UpgradeGuide/index.tsx
+++ b/website/src/components/UpgradeGuide/index.tsx
@@ -11,11 +11,11 @@ import {
   useActiveDocContext,
   useVersions,
 } from '@docusaurus/plugin-content-docs/client';
-import Admonition from '@theme/Admonition';
 import Link from '@docusaurus/Link';
-import CodeBlock from '@theme/CodeBlock';
 import useIsBrowser from '@docusaurus/useIsBrowser';
 import Translate from '@docusaurus/Translate';
+import Admonition from '@theme/Admonition';
+import CodeBlock from '@theme/CodeBlock';
 
 function PackageJson() {
   const latestVersion = useLatestVersion();
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
index dfaf796295..2472601709 100644
--- a/website/src/css/custom.css
+++ b/website/src/css/custom.css
@@ -191,23 +191,17 @@ div[class^='announcementBar_'] {
   content: 'site-custom-css-unique-rule';
 }
 
-@media only screen and (max-width: 996px) {
-  .video-container {
-    position: relative;
-    overflow: hidden;
-    width: 100%;
-    max-width: 560px;
-    margin: 0 auto;
-    padding-top: 56.25%;
-  }
+.video-container {
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+  max-width: 560px;
+  margin: 0 auto;
+}
 
-  .video-container iframe {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-  }
+.yt-lite > .lty-playbtn {
+  cursor: pointer;
+  border: 0;
 }
 
 .dropdown-separator {
diff --git a/website/src/data/__tests__/user.test.ts b/website/src/data/__tests__/user.test.ts
index 1cd0f4ebe5..06f76b53d1 100644
--- a/website/src/data/__tests__/user.test.ts
+++ b/website/src/data/__tests__/user.test.ts
@@ -5,12 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import {TagList, sortedUsers, type User} from '../users';
-import {Joi} from '@docusaurus/utils-validation';
-
 import fs from 'fs-extra';
 import path from 'path';
 import imageSize from 'image-size';
+import {Joi} from '@docusaurus/utils-validation';
+import {TagList, sortedUsers, type User} from '../users';
 
 declare global {
   namespace jest {
diff --git a/website/src/data/showcase/akara-blog.png b/website/src/data/showcase/akara-blog.png
new file mode 100644
index 0000000000..0b5ad67d26
Binary files /dev/null and b/website/src/data/showcase/akara-blog.png differ
diff --git a/website/src/data/showcase/piano-analytics.png b/website/src/data/showcase/piano-analytics.png
new file mode 100644
index 0000000000..ff4ca5619b
Binary files /dev/null and b/website/src/data/showcase/piano-analytics.png differ
diff --git a/website/src/data/showcase/vital.png b/website/src/data/showcase/vital.png
new file mode 100644
index 0000000000..1677a20dd5
Binary files /dev/null and b/website/src/data/showcase/vital.png differ
diff --git a/website/src/data/users.tsx b/website/src/data/users.tsx
index 754660f479..94855cab38 100644
--- a/website/src/data/users.tsx
+++ b/website/src/data/users.tsx
@@ -177,6 +177,14 @@ const Users: User[] = [
     source: null,
     tags: [],
   },
+  {
+    title: "Akara's blog",
+    description: 'Personal frontend blog for learning',
+    preview: require('./showcase/akara-blog.png'),
+    website: 'https://messiahhh.github.io/blog/',
+    source: 'https://github.com/messiahhh/blog',
+    tags: ['opensource', 'personal'],
+  },
   {
     title: 'Algolia Docsearch',
     description:
@@ -748,7 +756,8 @@ const Users: User[] = [
   },
   {
     title: 'GeekyWeb',
-    description: 'Global State and Logic Framework for reactive Applications',
+    description:
+      'Learn to code yourself by exploring documentations, try GeekyWeb once',
     preview: require('./showcase/geekyweb.png'),
     website: 'https://geekyweb.eu.org/',
     source: 'https://github.com/Designatory/GeekyWeb',
@@ -1348,6 +1357,14 @@ const Users: User[] = [
     source: 'https://github.com/pglet/website',
     tags: ['opensource'],
   },
+  {
+    title: 'Piano Analytics',
+    description: 'Piano Analytics SDKs documentation for developers',
+    preview: require('./showcase/piano-analytics.png'),
+    website: 'https://developers.atinternet-solutions.com/piano-analytics/',
+    source: null,
+    tags: ['favorite', 'product', 'design'],
+  },
   {
     title: 'Pipeline UI',
     description: 'Pipeline UI Documentation',
@@ -2152,6 +2169,14 @@ const Users: User[] = [
     source: null,
     tags: ['product'],
   },
+  {
+    title: 'Vital',
+    description: 'Wearables and Lab test API for digital health companies.',
+    preview: require('./showcase/vital.png'),
+    website: 'https://docs.tryvital.io',
+    source: 'https://github.com/tryVital/vital-docs-new',
+    tags: ['opensource', 'product', 'design'],
+  },
   {
     title: 'Vue NodeGui',
     description: 'A cross-platform native desktop app library',
diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx
index 86de91b011..62363cbbd6 100644
--- a/website/src/pages/index.tsx
+++ b/website/src/pages/index.tsx
@@ -6,6 +6,9 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
+import LiteYouTubeEmbed from 'react-lite-youtube-embed';
+import 'react-lite-youtube-embed/dist/LiteYouTubeEmbed.css';
 import Link from '@docusaurus/Link';
 import Translate, {translate} from '@docusaurus/Translate';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
@@ -19,8 +22,6 @@ import Tweets, {type TweetItem} from '@site/src/data/tweets';
 import Quotes from '@site/src/data/quotes';
 import Features, {type FeatureItem} from '@site/src/data/features';
 
-import clsx from 'clsx';
-
 import styles from './styles.module.css';
 
 function HeroBanner() {
@@ -162,14 +163,12 @@ function VideoContainer() {
             <Translate>Check it out in the intro video</Translate>
           </h2>
           <div className="video-container">
-            <iframe
-              width="560"
-              height="315"
-              src="https://www.youtube.com/embed/_An9EsKPhp0"
+            <LiteYouTubeEmbed
+              id="_An9EsKPhp0"
+              params="autoplay=1&autohide=1&showinfo=0&rel=0"
               title="Explain Like I'm 5: Docusaurus"
-              allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-              allowFullScreen
-              loading="lazy"
+              poster="maxresdefault"
+              webp
             />
           </div>
         </div>
diff --git a/website/src/pages/showcase/_components/ShowcaseCard/index.tsx b/website/src/pages/showcase/_components/ShowcaseCard/index.tsx
index a09b4c5e49..39c6c07f19 100644
--- a/website/src/pages/showcase/_components/ShowcaseCard/index.tsx
+++ b/website/src/pages/showcase/_components/ShowcaseCard/index.tsx
@@ -7,13 +7,10 @@
 
 import React from 'react';
 import clsx from 'clsx';
-import Image from '@theme/IdealImage';
 import Link from '@docusaurus/Link';
 import Translate from '@docusaurus/Translate';
-
-import styles from './styles.module.css';
+import Image from '@theme/IdealImage';
 import FavoriteIcon from '@site/src/components/svgIcons/FavoriteIcon';
-import Tooltip from '../ShowcaseTooltip';
 import {
   Tags,
   TagList,
@@ -22,6 +19,8 @@ import {
   type Tag,
 } from '@site/src/data/users';
 import {sortBy} from '@site/src/utils/jsUtils';
+import Tooltip from '../ShowcaseTooltip';
+import styles from './styles.module.css';
 
 const TagComp = React.forwardRef<HTMLLIElement, Tag>(
   ({label, color, description}, ref) => (
diff --git a/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx b/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx
index 8df064852e..acb4516d11 100644
--- a/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx
+++ b/website/src/pages/showcase/_components/ShowcaseFilterToggle/index.tsx
@@ -6,12 +6,12 @@
  */
 
 import React, {useState, useEffect, useCallback} from 'react';
+import clsx from 'clsx';
 import {useHistory, useLocation} from '@docusaurus/router';
 
 import {prepareUserState} from '../../index';
 
 import styles from './styles.module.css';
-import clsx from 'clsx';
 
 export type Operator = 'OR' | 'AND';
 
diff --git a/website/src/pages/showcase/_components/ShowcaseTagSelect/index.tsx b/website/src/pages/showcase/_components/ShowcaseTagSelect/index.tsx
index 29ed978841..7495cf42eb 100644
--- a/website/src/pages/showcase/_components/ShowcaseTagSelect/index.tsx
+++ b/website/src/pages/showcase/_components/ShowcaseTagSelect/index.tsx
@@ -15,9 +15,9 @@ import React, {
 } from 'react';
 import {useHistory, useLocation} from '@docusaurus/router';
 import {toggleListItem} from '@site/src/utils/jsUtils';
-import {prepareUserState} from '../../index';
 import type {TagType} from '@site/src/data/users';
 
+import {prepareUserState} from '../../index';
 import styles from './styles.module.css';
 
 interface Props extends ComponentProps<'input'> {
diff --git a/website/src/pages/showcase/index.tsx b/website/src/pages/showcase/index.tsx
index e3a576ca3c..0cfd04de3d 100644
--- a/website/src/pages/showcase/index.tsx
+++ b/website/src/pages/showcase/index.tsx
@@ -6,11 +6,21 @@
  */
 
 import React, {useState, useMemo, useEffect} from 'react';
+import clsx from 'clsx';
+import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
+import Translate, {translate} from '@docusaurus/Translate';
+import {useHistory, useLocation} from '@docusaurus/router';
+import {usePluralForm} from '@docusaurus/theme-common';
 
 import Layout from '@theme/Layout';
-import clsx from 'clsx';
-
 import FavoriteIcon from '@site/src/components/svgIcons/FavoriteIcon';
+import {
+  sortedUsers,
+  Tags,
+  TagList,
+  type User,
+  type TagType,
+} from '@site/src/data/users';
 import ShowcaseTagSelect, {
   readSearchTags,
 } from './_components/ShowcaseTagSelect';
@@ -19,20 +29,8 @@ import ShowcaseFilterToggle, {
   readOperator,
 } from './_components/ShowcaseFilterToggle';
 import ShowcaseCard from './_components/ShowcaseCard';
-import {
-  sortedUsers,
-  Tags,
-  TagList,
-  type User,
-  type TagType,
-} from '@site/src/data/users';
 import ShowcaseTooltip from './_components/ShowcaseTooltip';
 
-import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment';
-import Translate, {translate} from '@docusaurus/Translate';
-import {useHistory, useLocation} from '@docusaurus/router';
-import {usePluralForm} from '@docusaurus/theme-common';
-
 import styles from './styles.module.css';
 
 const TITLE = 'Docusaurus Site Showcase';
diff --git a/website/src/pages/versions.tsx b/website/src/pages/versions.tsx
index c9239d28ed..9db0ec5d10 100644
--- a/website/src/pages/versions.tsx
+++ b/website/src/pages/versions.tsx
@@ -8,14 +8,13 @@
 import React from 'react';
 import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
 import Link from '@docusaurus/Link';
-import Layout from '@theme/Layout';
-import Heading from '@theme/Heading';
 import Translate from '@docusaurus/Translate';
 import {
   useVersions,
   useLatestVersion,
 } from '@docusaurus/plugin-content-docs/client';
-
+import Layout from '@theme/Layout';
+import Heading from '@theme/Heading';
 import VersionsArchived from '@site/versionsArchived.json';
 
 const VersionsArchivedList = Object.entries(VersionsArchived);
diff --git a/website/src/plugins/changelog/theme/ChangelogAuthors/index.tsx b/website/src/plugins/changelog/theme/ChangelogAuthors/index.tsx
index 0ca25fbe7c..57be25cbd4 100644
--- a/website/src/plugins/changelog/theme/ChangelogAuthors/index.tsx
+++ b/website/src/plugins/changelog/theme/ChangelogAuthors/index.tsx
@@ -7,11 +7,11 @@
 
 import React, {useState} from 'react';
 import clsx from 'clsx';
-import type {Props} from '@theme/BlogPostAuthors';
 import ChangelogAuthor from '@theme/ChangelogAuthor';
+import IconExpand from '@theme/IconExpand';
+import type {Props} from '@theme/BlogPostAuthors';
 
 import styles from './styles.module.css';
-import IconExpand from '@theme/IconExpand';
 
 // Component responsible for the authors layout
 export default function BlogPostAuthors({
diff --git a/website/src/plugins/changelog/theme/ChangelogItem/index.tsx b/website/src/plugins/changelog/theme/ChangelogItem/index.tsx
index fea34d46bc..fee2063062 100644
--- a/website/src/plugins/changelog/theme/ChangelogItem/index.tsx
+++ b/website/src/plugins/changelog/theme/ChangelogItem/index.tsx
@@ -12,10 +12,10 @@ import Link from '@docusaurus/Link';
 import {useBaseUrlUtils} from '@docusaurus/useBaseUrl';
 import {blogPostContainerID} from '@docusaurus/utils-common';
 import MDXComponents from '@theme/MDXComponents';
+import ChangelogAuthors from '@theme/ChangelogAuthors';
 import type {Props} from '@theme/BlogPostItem';
 
 import styles from './styles.module.css';
-import ChangelogAuthors from '@theme/ChangelogAuthors';
 
 export default function ChangelogItem(props: Props): JSX.Element {
   const {withBaseUrl} = useBaseUrlUtils();
diff --git a/website/src/plugins/changelog/theme/ChangelogList/index.tsx b/website/src/plugins/changelog/theme/ChangelogList/index.tsx
index cf0d7b7297..17aceebb6f 100644
--- a/website/src/plugins/changelog/theme/ChangelogList/index.tsx
+++ b/website/src/plugins/changelog/theme/ChangelogList/index.tsx
@@ -6,21 +6,21 @@
  */
 
 import React from 'react';
-import BlogLayout from '@theme/BlogLayout';
-import BlogListPaginator from '@theme/BlogListPaginator';
+import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
-import type {Props} from '@theme/BlogListPage';
+import Link from '@docusaurus/Link';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
-import Link from '@docusaurus/Link';
+import BlogLayout from '@theme/BlogLayout';
+import BlogListPaginator from '@theme/BlogListPaginator';
+import SearchMetadata from '@theme/SearchMetadata';
 import ChangelogItem from '@theme/ChangelogItem';
+import type {Props} from '@theme/BlogListPage';
 
 import styles from './styles.module.css';
-import SearchMetadata from '@theme/SearchMetadata';
-import clsx from 'clsx';
 
 function ChangelogListMetadata(props: Props): JSX.Element {
   const {metadata} = props;
diff --git a/website/src/plugins/changelog/theme/ChangelogPage/index.tsx b/website/src/plugins/changelog/theme/ChangelogPage/index.tsx
index ef45aa304e..7ce92e1707 100644
--- a/website/src/plugins/changelog/theme/ChangelogPage/index.tsx
+++ b/website/src/plugins/changelog/theme/ChangelogPage/index.tsx
@@ -6,19 +6,19 @@
  */
 
 import React from 'react';
+import clsx from 'clsx';
 import Translate from '@docusaurus/Translate';
-import BlogLayout from '@theme/BlogLayout';
-import ChangelogItem from '@theme/ChangelogItem';
-import ChangelogPaginator from '@theme/ChangelogPaginator';
-import type {Props} from '@theme/BlogPostPage';
+import Link from '@docusaurus/Link';
 import {
   PageMetadata,
   HtmlClassNameProvider,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
+import BlogLayout from '@theme/BlogLayout';
+import ChangelogItem from '@theme/ChangelogItem';
+import ChangelogPaginator from '@theme/ChangelogPaginator';
 import TOC from '@theme/TOC';
-import Link from '@docusaurus/Link';
-import clsx from 'clsx';
+import type {Props} from '@theme/BlogPostPage';
 
 function ChangelogPageMetadata(props: Props): JSX.Element {
   const {content: BlogPostContents} = props;
diff --git a/website/src/plugins/featureRequests/FeatureRequestsPage.tsx b/website/src/plugins/featureRequests/FeatureRequestsPage.tsx
index 516f490485..f5d836130b 100644
--- a/website/src/plugins/featureRequests/FeatureRequestsPage.tsx
+++ b/website/src/plugins/featureRequests/FeatureRequestsPage.tsx
@@ -6,10 +6,10 @@
  */
 
 import React, {useEffect} from 'react';
+import clsx from 'clsx';
 import Layout from '@theme/Layout';
 
 import cannyScript from './cannyScript';
-import clsx from 'clsx';
 import styles from './styles.module.css';
 
 const BOARD_TOKEN = '054e0e53-d951-b14c-7e74-9eb8f9ed2f91';
diff --git a/website/src/theme/CodeBlock/index.tsx b/website/src/theme/CodeBlock/index.tsx
index dd5aedfc18..82dc1b0f5f 100644
--- a/website/src/theme/CodeBlock/index.tsx
+++ b/website/src/theme/CodeBlock/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/CodeBlock';
 import CodeBlock from '@theme-original/CodeBlock';
+import type {Props} from '@theme/CodeBlock';
 
 // This component does nothing on purpose
 // Dogfood: wrapping a theme component already enhanced by another theme
diff --git a/website/src/theme/ColorModeToggle.tsx b/website/src/theme/ColorModeToggle.tsx
index e9e653d163..44f81a00ff 100644
--- a/website/src/theme/ColorModeToggle.tsx
+++ b/website/src/theme/ColorModeToggle.tsx
@@ -7,7 +7,6 @@
 
 import React from 'react';
 import OriginalToggle from '@theme-original/ColorModeToggle';
-import type {Props} from '@theme/ColorModeToggle';
 import {
   lightStorage,
   darkStorage,
@@ -19,6 +18,7 @@ import {
   DARK_BACKGROUND_COLOR,
   COLOR_SHADES,
 } from '@site/src/utils/colorUtils';
+import type {Props} from '@theme/ColorModeToggle';
 
 // The ColorGenerator modifies the DOM styles. The styles are persisted in
 // session storage, and we need to apply the same style when toggling modes even
diff --git a/website/src/theme/DocSidebar/Desktop/Content/index.js b/website/src/theme/DocSidebar/Desktop/Content/index.js
index 0d47b8eec9..19d30bc260 100644
--- a/website/src/theme/DocSidebar/Desktop/Content/index.js
+++ b/website/src/theme/DocSidebar/Desktop/Content/index.js
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import Content from '@theme-original/DocSidebar/Desktop/Content';
 import {useLocation} from '@docusaurus/router';
+import Content from '@theme-original/DocSidebar/Desktop/Content';
 
 function SidebarAd() {
   return (
diff --git a/website/src/theme/Layout/index.tsx b/website/src/theme/Layout/index.tsx
index 78f03a793f..44034528ed 100644
--- a/website/src/theme/Layout/index.tsx
+++ b/website/src/theme/Layout/index.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
-import type {Props} from '@theme/Layout';
 import Layout from '@theme-original/Layout';
+import type {Props} from '@theme/Layout';
 
 // This component is only used to test for CSS insertion order
 import './styles.module.css';
diff --git a/yarn.lock b/yarn.lock
index b7f0f09e30..5374e67cd0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1871,9 +1871,9 @@
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@leichtgewicht/ip-codec@^2.0.1":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz#0300943770e04231041a51bd39f0439b5c7ab4f0"
-  integrity sha512-nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg==
+  version "2.0.4"
+  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"
@@ -3025,94 +3025,94 @@
     "@svgr/plugin-jsx" "^6.2.1"
     "@svgr/plugin-svgo" "^6.2.0"
 
-"@swc/core-android-arm-eabi@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.178.tgz#8a2e1c6a81236e437981f1b2a0f7f74fddc9d24f"
-  integrity sha512-eWW8aSNe/X9xinM5Nb07mLjIGLXWFfUr7InxNrxHggRZLb1aUm29fUlYWPt+TWsj23uj8qJCmzryjFLUy+gDxA==
+"@swc/core-android-arm-eabi@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.181.tgz#8317b96dbcf43f30bc0a9c139f7dbe2ffea4ce2f"
+  integrity sha512-H3HNf8j6M13uIbSruef8iMsCElJJDZOhp5qxwm/+P1jAG4eQ4vPfajIlTVdFJes8Adrbr4WQaVvl+m4BQw51JQ==
 
-"@swc/core-android-arm64@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.178.tgz#c967e507c942c42f23f735d95bb47291eb029cad"
-  integrity sha512-en/WKIbwmu8Q6LFoaiCPqS9Lqnc5Or2oWQpWG3awN7rbn2OqwYgki76fnqgI4dkxURztqDPZ5Fxh8oGkrmYxWg==
+"@swc/core-android-arm64@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.181.tgz#23ee887e08993d26a2b31a5dce5232a5cf4e17b1"
+  integrity sha512-b1apYKeosBaXl28xE/By4QVHYrXaR2+nOdcP6rsDXg6nyLBArtoiS5YUFikFN/VQbSAQqNeJQ+rovT5zITrgSQ==
 
-"@swc/core-darwin-arm64@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.178.tgz#44a59af2338043a8218047a63915955744074138"
-  integrity sha512-P0jaGwMVVnTRaeo+6NXTnsqIFelYl+ZeZ1W0BSD+ymOcFlUhjpw1ADux1XiXTbGgloN4uzCmPxphrJO0b7rsag==
+"@swc/core-darwin-arm64@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.181.tgz#33d44c0aed28baebc797892d2243a845f5b49905"
+  integrity sha512-M3/PPeO6NTN7GYa1mOWPNMaAPxEQH8xd+X6FHMa7OBCi+Qxkarafu4DZRfzR88TcS3XikqFLgmmzSP7Z/tye2w==
 
-"@swc/core-darwin-x64@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.178.tgz#a94dc71a6f91c679dcc9908b2e8a27156cfe258c"
-  integrity sha512-ZSWe4Wcnwkrf0Eh/EeBsGRM38OCT6wl8ynWRXO6j5fb+S5cQx6KPpa6TrlQ+43jduzv44IizjnVanHXDB7eqww==
+"@swc/core-darwin-x64@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.181.tgz#6da604c4c4e85c1baad9c355f25a4e0cceff52cb"
+  integrity sha512-8Uc6gx7YN5+eSnk3h7aHqp1f3RFoBJPDPeH9cURm4mfE4BTgkVgkctUm0IE5sS5AotazVbrOwhEFrl7TONSfPA==
 
-"@swc/core-freebsd-x64@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.178.tgz#97559d237aba5da3cb8d951e09872d397ae3a36a"
-  integrity sha512-pZCHOvSGJ0JecepsXN7sAesamsbmmkXQ2XHlOuPFRqyrmE7mrZ6NwgUKfXvGZ9kuE1xwqBLFPwco9IM/cNSl6g==
+"@swc/core-freebsd-x64@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.181.tgz#41b26a7fd1214c9947e8a433231bcb3166916a33"
+  integrity sha512-SbnsbJHGFNY7VSTA5OhBh2PmLgQumIGerAxTCTYO1IgtbADCTL+gCjU0TK0viG/zpH4jnjaL965BI4JTo/bpRg==
 
-"@swc/core-linux-arm-gnueabihf@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.178.tgz#a56cf9bfc5d15b1171d9161aca345e3abc3d1a11"
-  integrity sha512-5IqU+ILaMRW/u+Ww8ZFP18i0/TFFZbQ/3VS2rlRloXDKAQhYc9ZAwi4/jLccX+zcB7l5JzFuf+skqjsf+n8eFQ==
+"@swc/core-linux-arm-gnueabihf@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.181.tgz#780f37f6b611ccd5c04d484b7b33e436e2ea8568"
+  integrity sha512-aWO6Lr9wea96Z7AEagzf4reKgDb3UWXZnClwJK7baScwF8KV+Mh99vVgkSe1nj2gKOZ31pBLp62RDJkc3gdlnA==
 
-"@swc/core-linux-arm64-gnu@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.178.tgz#e9b8ba073d5f59c97645d27c877b43400110cf86"
-  integrity sha512-1n3v6JzN7P/wNCewbKmxPNp06XYxUlXVpZKRgKM3JCq9jX1IzKcaK+5u0l0fk94PTTsiPCuPFi7RzLfMc/gtDA==
+"@swc/core-linux-arm64-gnu@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.181.tgz#34a4639fdcf3cf6c30087f719200c2fb1eac8792"
+  integrity sha512-+7fzDwsvcbhPafKdminMQrU3Ej1NHltXy7k+zgjj8BDPZbfi8hRzQcONeBV7sfl4xvw3d3roNHu2UMmKzLNs0w==
 
-"@swc/core-linux-arm64-musl@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.178.tgz#b1f8f16880e018df28d68f88b5b0e9086906413f"
-  integrity sha512-U6FHVkrp8AwkBNzvNG6vwYpPZBVz1L6leMb56S59eI3wib3Trz2pTlZnsGLPIFyjTqLOowhhFJ+TrpX65NiAaw==
+"@swc/core-linux-arm64-musl@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.181.tgz#c1388644df35ad30b71c0d09fd9a96d31405299f"
+  integrity sha512-U9k8pv2oCxYYfu9DdOO1ZZgqbmF97NgJzSaIu3PsTedF4RcGIiPcuGOFqrUECsGUW2i6uKejE8onbXPj9UmaZQ==
 
-"@swc/core-linux-x64-gnu@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.178.tgz#9a70d87e919b4d2c9a57d400ba28663f05814a3b"
-  integrity sha512-+0Lsrr7sO7CybsqQZ2o/CI9r2TGCGQ7cgemE1y6FULkY3lf2keCsch535Vbq3/emDD9ujoHiph87sIOIBHjEIw==
+"@swc/core-linux-x64-gnu@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.181.tgz#2384b58d35bb2e31521005869acbc6ea2e0700b4"
+  integrity sha512-9AQXrvZ9BFQJeqYMpKQZRf9h/DEwhfHIR39krehO+g594i+mkkp+UNTToez6Ifn+NBYl58xyEcQGwsYIqtdYVw==
 
-"@swc/core-linux-x64-musl@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.178.tgz#fbb195c9d3e980bc90555d716cc9c46cae08a761"
-  integrity sha512-tVYcPA+vSaeGCUOfIO27viYaHZhtW1MvD1gBqpD1AUrV9ufyCklihH5BlxOTuGww464lGCybKu2VbsoHBz2qIw==
+"@swc/core-linux-x64-musl@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.181.tgz#4938a87eae011daaf9f360a1452ece8a2e9c5816"
+  integrity sha512-Pq/aBMj3F4CR4tXq85t7IW3piu76a677nIoo6QtBkAjrQ5QuJqpaez/5aewipG+kIXpiu/DNFIN+cISa1QeC8A==
 
-"@swc/core-win32-arm64-msvc@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.178.tgz#ac88b1b0e543398aa549007e5ce32ab344e2fb60"
-  integrity sha512-KgpApFeWUSBpUELz6PT4AaML4lW3ziz2kVlrZlLrUk5XRJv/J+KKHJ+iYQUnYCTOOeGI9vSVmzjfdEvYyIhB/Q==
+"@swc/core-win32-arm64-msvc@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.181.tgz#553b16cfb5aa918f191227abe929619263142ea5"
+  integrity sha512-m24036tVFDE8ZJ3fBVBfsHw4tHd0BG6g3TvT2MLAiW2MezYeTdrGpmvPBz4Woz686I/06cWeSg7cZF1/ZcZMMA==
 
-"@swc/core-win32-ia32-msvc@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.178.tgz#4c73d32641b892623736ce614b62da8de03f23fc"
-  integrity sha512-j3E0VxfewsEZYw2tSh4C4TlIehfvYKibcpnSsZTIjXMW3a3SSSvYtEus63TjbEj2IjtAXrZnyNPeuej9ioY8Gg==
+"@swc/core-win32-ia32-msvc@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.181.tgz#e520b9caa136c283fa789805bfe46966faec6d81"
+  integrity sha512-OPROzGapmr29qqwvB/aP9SA80r2eIukj+q7gghdQVptJrQU4GrTyzW1TpnGtpzj8rLZz4hEG6KtyPUh54bJZ/g==
 
-"@swc/core-win32-x64-msvc@1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.178.tgz#639a3138ed4a964fa1e4145c35c15a2c54dc1458"
-  integrity sha512-ocsdX9q2iFMJHj2wdhdNLwh26Ap0crMGbI6LVNYfngDFON7ywS5qOvjufHSgtIxARMVusUDjmehqRCmzd3Yr6w==
+"@swc/core-win32-x64-msvc@1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.181.tgz#5cc5843e2aad673abb76231971faca140c711709"
+  integrity sha512-YrIaS63XsGiQ9AgxUVZ7Irt4pwQc3c2TPN7PyQP7ok9zBZxY5pBTwRTdLctlF4LNsSavlHE5+rvdPzcYAG0ekQ==
 
-"@swc/core@^1.2.178":
-  version "1.2.178"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.178.tgz#7f6fac9763699a1e8c3b97af8a3c4d07122be741"
-  integrity sha512-c+Wu65ROsMiZdkL/VOpHIeiJv1w3jPnfZez41cD95yuXk+oiWDNvtWUqbU4l1x38eYKi9YlY6wPYpLBJdHA22w==
+"@swc/core@^1.2.181":
+  version "1.2.181"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.181.tgz#87a856be4581be4da5515287a2120544f9d733ba"
+  integrity sha512-evQX+Br/gC+FYLbUIF1dOQa7hUzBpowrcbgPkIRCEvi4HrCn7pGBZ2ZHBXmwEtBdLfOlyQvN/8USClApQKK4Rw==
   optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.2.178"
-    "@swc/core-android-arm64" "1.2.178"
-    "@swc/core-darwin-arm64" "1.2.178"
-    "@swc/core-darwin-x64" "1.2.178"
-    "@swc/core-freebsd-x64" "1.2.178"
-    "@swc/core-linux-arm-gnueabihf" "1.2.178"
-    "@swc/core-linux-arm64-gnu" "1.2.178"
-    "@swc/core-linux-arm64-musl" "1.2.178"
-    "@swc/core-linux-x64-gnu" "1.2.178"
-    "@swc/core-linux-x64-musl" "1.2.178"
-    "@swc/core-win32-arm64-msvc" "1.2.178"
-    "@swc/core-win32-ia32-msvc" "1.2.178"
-    "@swc/core-win32-x64-msvc" "1.2.178"
+    "@swc/core-android-arm-eabi" "1.2.181"
+    "@swc/core-android-arm64" "1.2.181"
+    "@swc/core-darwin-arm64" "1.2.181"
+    "@swc/core-darwin-x64" "1.2.181"
+    "@swc/core-freebsd-x64" "1.2.181"
+    "@swc/core-linux-arm-gnueabihf" "1.2.181"
+    "@swc/core-linux-arm64-gnu" "1.2.181"
+    "@swc/core-linux-arm64-musl" "1.2.181"
+    "@swc/core-linux-x64-gnu" "1.2.181"
+    "@swc/core-linux-x64-musl" "1.2.181"
+    "@swc/core-win32-arm64-msvc" "1.2.181"
+    "@swc/core-win32-ia32-msvc" "1.2.181"
+    "@swc/core-win32-x64-msvc" "1.2.181"
 
-"@swc/jest@^0.2.20":
-  version "0.2.20"
-  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.20.tgz#2bddb4348fb730296b86cdcd96748be131b11395"
-  integrity sha512-5qSUBYY1wyIMn7p0Vl9qqV4hMI69oJwZCIPUpBsTFWN2wlwn6RDugzdgCn+bLXVYh+Cxi8bJcZ1uumDgsoL+FA==
+"@swc/jest@^0.2.21":
+  version "0.2.21"
+  resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.21.tgz#e8c4e234016a914f4cfbb7d75844860a250c1d1c"
+  integrity sha512-/+NcExiZbxXANNhNPnIdFuGq62CeumulLS1bngwqIXd8H7d96LFUfrYzdt8tlTwLMel8tFtQ5aRjzVkyOTyPDw==
   dependencies:
     "@jest/create-cache-key-function" "^27.4.2"
 
@@ -3843,14 +3843,14 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a"
-  integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==
+"@typescript-eslint/eslint-plugin@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.23.0.tgz#bc4cbcf91fbbcc2e47e534774781b82ae25cc3d8"
+  integrity sha512-hEcSmG4XodSLiAp1uxv/OQSGsDY6QN3TcRU32gANp+19wGE1QQZLRS8/GV58VRUoXhnkuJ3ZxNQ3T6Z6zM59DA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.22.0"
-    "@typescript-eslint/type-utils" "5.22.0"
-    "@typescript-eslint/utils" "5.22.0"
+    "@typescript-eslint/scope-manager" "5.23.0"
+    "@typescript-eslint/type-utils" "5.23.0"
+    "@typescript-eslint/utils" "5.23.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -3858,69 +3858,69 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.22.0.tgz#7bedf8784ef0d5d60567c5ba4ce162460e70c178"
-  integrity sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==
+"@typescript-eslint/parser@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.23.0.tgz#443778e1afc9a8ff180f91b5e260ac3bec5e2de1"
+  integrity sha512-V06cYUkqcGqpFjb8ttVgzNF53tgbB/KoQT/iB++DOIExKmzI9vBJKjZKt/6FuV9c+zrDsvJKbJ2DOCYwX91cbw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.22.0"
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/typescript-estree" "5.22.0"
+    "@typescript-eslint/scope-manager" "5.23.0"
+    "@typescript-eslint/types" "5.23.0"
+    "@typescript-eslint/typescript-estree" "5.23.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24"
-  integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==
+"@typescript-eslint/scope-manager@5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.23.0.tgz#4305e61c2c8e3cfa3787d30f54e79430cc17ce1b"
+  integrity sha512-EhjaFELQHCRb5wTwlGsNMvzK9b8Oco4aYNleeDlNuL6qXWDF47ch4EhVNPh8Rdhf9tmqbN4sWDk/8g+Z/J8JVw==
   dependencies:
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/visitor-keys" "5.22.0"
+    "@typescript-eslint/types" "5.23.0"
+    "@typescript-eslint/visitor-keys" "5.23.0"
 
-"@typescript-eslint/type-utils@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19"
-  integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==
+"@typescript-eslint/type-utils@5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.23.0.tgz#f852252f2fc27620d5bb279d8fed2a13d2e3685e"
+  integrity sha512-iuI05JsJl/SUnOTXA9f4oI+/4qS/Zcgk+s2ir+lRmXI+80D8GaGwoUqs4p+X+4AxDolPpEpVUdlEH4ADxFy4gw==
   dependencies:
-    "@typescript-eslint/utils" "5.22.0"
+    "@typescript-eslint/utils" "5.23.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0"
-  integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==
+"@typescript-eslint/types@5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.23.0.tgz#8733de0f58ae0ed318dbdd8f09868cdbf9f9ad09"
+  integrity sha512-NfBsV/h4dir/8mJwdZz7JFibaKC3E/QdeMEDJhiAE3/eMkoniZ7MjbEMCGXw6MZnZDMN3G9S0mH/6WUIj91dmw==
 
-"@typescript-eslint/typescript-estree@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97"
-  integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==
+"@typescript-eslint/typescript-estree@5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.23.0.tgz#dca5f10a0a85226db0796e8ad86addc9aee52065"
+  integrity sha512-xE9e0lrHhI647SlGMl+m+3E3CKPF1wzvvOEWnuE3CCjjT7UiRnDGJxmAcVKJIlFgK6DY9RB98eLr1OPigPEOGg==
   dependencies:
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/visitor-keys" "5.22.0"
+    "@typescript-eslint/types" "5.23.0"
+    "@typescript-eslint/visitor-keys" "5.23.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.22.0", "@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8"
-  integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==
+"@typescript-eslint/utils@5.23.0", "@typescript-eslint/utils@^5.10.0", "@typescript-eslint/utils@^5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.23.0.tgz#4691c3d1b414da2c53d8943310df36ab1c50648a"
+  integrity sha512-dbgaKN21drqpkbbedGMNPCtRPZo1IOUr5EI9Jrrh99r5UW5Q0dz46RKXeSBoPV+56R6dFKpbrdhgUNSJsDDRZA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.22.0"
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/typescript-estree" "5.22.0"
+    "@typescript-eslint/scope-manager" "5.23.0"
+    "@typescript-eslint/types" "5.23.0"
+    "@typescript-eslint/typescript-estree" "5.23.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c"
-  integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==
+"@typescript-eslint/visitor-keys@5.23.0":
+  version "5.23.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.23.0.tgz#057c60a7ca64667a39f991473059377a8067c87b"
+  integrity sha512-Vd4mFNchU62sJB8pX19ZSPog05B0Y0CE2UxAZPT5k4iqhRYjPnqyY3woMxCd0++t9OTqkgjST+1ydLBi7e2Fvg==
   dependencies:
-    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/types" "5.23.0"
     eslint-visitor-keys "^3.0.0"
 
 "@webassemblyjs/ast@1.11.1":
@@ -5097,9 +5097,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.30001338"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz#b5dd7a7941a51a16480bdf6ff82bded1628eec0d"
-  integrity sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ==
+  version "1.0.30001339"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001339.tgz#f9aece4ea8156071613b27791547ba0b33f176cf"
+  integrity sha512-Es8PiVqCe+uXdms0Gu5xP5PF2bxLR7OBp3wUzUnuO7OHzhOfCyg3hdiGWVPVxhiuniOzng+hTc1u3fEQ0TlkSQ==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -5834,27 +5834,27 @@ copy-webpack-plugin@^10.2.4:
     serialize-javascript "^6.0.0"
 
 core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.22.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.4.tgz#d700f451e50f1d7672dcad0ac85d910e6691e579"
-  integrity sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA==
+  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==
   dependencies:
     browserslist "^4.20.3"
     semver "7.0.0"
 
 core-js-pure@^3.20.2:
-  version "3.22.4"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.22.4.tgz#a992210f4cad8b32786b8654563776c56b0e0d0a"
-  integrity sha512-4iF+QZkpzIz0prAFuepmxwJ2h5t4agvE8WPYqs2mjLJMNNwJOnpch76w2Q7bUfCPEv/V7wpvOfog0w273M+ZSw==
+  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==
 
 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.4:
-  version "3.22.4"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.22.4.tgz#f4b3f108d45736935aa028444a69397e40d8c531"
-  integrity sha512-1uLykR+iOfYja+6Jn/57743gc9n73EWiOnSJJ4ba3B4fOEYDBv25MagmEZBxTp5cWq4b/KPx/l77zgsp28ju4w==
+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"
@@ -6694,7 +6694,7 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.9.2:
+enhanced-resolve@^5.9.3:
   version "5.9.3"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
   integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
@@ -7950,9 +7950,9 @@ globals@^11.1.0:
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.6.0, globals@^13.9.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
-  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+  version "13.14.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.14.0.tgz#daf3ff9b4336527cf56e98330b6f64bea9aff9df"
+  integrity sha512-ERO68sOYwm5UuLvSJTY7w7NP2c8S4UcXs3X1GBX8cwOr+ShOcDBbCY5mH4zxz0jsYCdJ8ve8Mv9n2YGJMB1aeg==
   dependencies:
     type-fest "^0.20.2"
 
@@ -8532,10 +8532,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535"
-  integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==
+husky@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.1.tgz#511cb3e57de3e3190514ae49ed50f6bc3f50b3e9"
+  integrity sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==
 
 hyphenate-style-name@^1.0.2:
   version "1.0.4"
@@ -8735,9 +8735,9 @@ invariant@^2.2.4:
     loose-envify "^1.0.0"
 
 ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.6.tgz#5a651a37644586e18b6ba3b48ca122bf56495f67"
+  integrity sha512-/dAvCivFs/VexXAtiAoMIqyhkhStNC9CPD0h1noonimOgB1xrCkexF2c5CjlqQ72GgMPjN6tiV+oreoPv3Ft1g==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
@@ -9775,12 +9775,12 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -12522,6 +12522,11 @@ react-lifecycles-compat@^3.0.4:
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
+react-lite-youtube-embed@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/react-lite-youtube-embed/-/react-lite-youtube-embed-2.2.2.tgz#d61fce061ef730ac74072b82eb910021b8a9a7d1"
+  integrity sha512-1NqbNDcunRcB/9G9upXM59jyLdEUXy3Xk/XJ+JdIdT04qNTj5Xi8enR1BzMdowLsrDv8yW5qge2ob3gb22Qfnw==
+
 react-live@2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/react-live/-/react-live-2.2.3.tgz#260f99194213799f0005e473e7a4154c699d6a7c"
@@ -13325,9 +13330,9 @@ rollup-plugin-terser@^7.0.0:
     terser "^5.0.0"
 
 rollup@^2.43.1:
-  version "2.72.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.72.0.tgz#f94280b003bcf9f2f1f2594059a9db5abced371e"
-  integrity sha512-KqtR2YcO35/KKijg4nx4STO3569aqCUeGRkKWnJ6r+AvBBrVY9L4pmf4NHVrQr4mTOq6msbohflxr2kpihhaOA==
+  version "2.72.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.72.1.tgz#861c94790537b10008f0ca0fbc60e631aabdd045"
+  integrity sha512-NTc5UGy/NWFGpSqF1lFY8z9Adri6uhyMLI6LvPAXdBKoPRFhIIiBUpt+Qg2awixqO3xvzSijjhnb4+QEZwJmxA==
   optionalDependencies:
     fsevents "~2.3.2"
 
@@ -15704,10 +15709,10 @@ webpack-sources@^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==
 
-webpack@^5, webpack@^5.72.0:
-  version "5.72.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28"
-  integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==
+webpack@^5, webpack@^5.72.1:
+  version "5.72.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.1.tgz#3500fc834b4e9ba573b9f430b2c0a61e1bb57d13"
+  integrity sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -15718,13 +15723,13 @@ webpack@^5, webpack@^5.72.0:
     acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.9.2"
+    enhanced-resolve "^5.9.3"
     es-module-lexer "^0.9.0"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.9"
-    json-parse-better-errors "^1.0.2"
+    json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"