diff --git a/packages/docusaurus-plugin-content-docs/src/client/index.ts b/packages/docusaurus-plugin-content-docs/src/client/index.ts
index bf475ee00e9dc..06b86860dc1c2 100644
--- a/packages/docusaurus-plugin-content-docs/src/client/index.ts
+++ b/packages/docusaurus-plugin-content-docs/src/client/index.ts
@@ -85,7 +85,7 @@ export const useAllDocsData = (): {[pluginId: string]: GlobalPluginData} =>
       }
     | undefined) ?? StableEmptyObject;
 
-export const useDocsData = (pluginId: string | undefined): GlobalPluginData =>
+export const useDocsData = (pluginId?: string): GlobalPluginData =>
   usePluginData('docusaurus-plugin-content-docs', pluginId, {
     failfast: true,
   }) as GlobalPluginData;
@@ -117,12 +117,12 @@ export function useActivePluginAndVersion(
 }
 
 /** Versions are returned ordered (most recent first). */
-export function useVersions(pluginId: string | undefined): GlobalVersion[] {
+export function useVersions(pluginId?: string): GlobalVersion[] {
   const data = useDocsData(pluginId);
   return data.versions;
 }
 
-export function useLatestVersion(pluginId: string | undefined): GlobalVersion {
+export function useLatestVersion(pluginId?: string): GlobalVersion {
   const data = useDocsData(pluginId);
   return getLatestVersion(data);
 }
@@ -131,17 +131,13 @@ export function useLatestVersion(pluginId: string | undefined): GlobalVersion {
  * Returns `undefined` on doc-unrelated pages, because there's no version
  * currently considered as active.
  */
-export function useActiveVersion(
-  pluginId: string | undefined,
-): GlobalVersion | undefined {
+export function useActiveVersion(pluginId?: string): GlobalVersion | undefined {
   const data = useDocsData(pluginId);
   const {pathname} = useLocation();
   return getActiveVersion(data, pathname);
 }
 
-export function useActiveDocContext(
-  pluginId: string | undefined,
-): ActiveDocContext {
+export function useActiveDocContext(pluginId?: string): ActiveDocContext {
   const data = useDocsData(pluginId);
   const {pathname} = useLocation();
   return getActiveDocContext(data, pathname);
@@ -150,7 +146,7 @@ export function useActiveDocContext(
  * Useful to say "hey, you are not on the latest docs version, please switch"
  */
 export function useDocVersionSuggestions(
-  pluginId: string | undefined,
+  pluginId?: string,
 ): DocVersionSuggestions {
   const data = useDocsData(pluginId);
   const {pathname} = useLocation();
diff --git a/website/tsconfig.json b/website/tsconfig.json
index 40130b894da3c..0fcd0946a271c 100644
--- a/website/tsconfig.json
+++ b/website/tsconfig.json
@@ -28,6 +28,8 @@
     "noUnusedParameters": false,
     "importsNotUsedAsValues": "remove",
 
+    "moduleResolution": "NodeNext",
+
     // This is important. We run `yarn tsc` in website so we can catch issues
     // with our declaration files (mostly names that are forgotten to be
     // imported, invalid semantics...). Because we don't have end-to-end type