[pull] main from facebook:main

.github/workflows/tests-e2e.yml

@@ -144,6 +144,7 @@ jobs:
           yarn config set npmRegistryServer http://localhost:4873
           yarn config set unsafeHttpWhitelist --json '["localhost"]'
           yarn config set enableGlobalCache true
+          yarn config set npmPreapprovedPackages --json '["@docusaurus/*"]'
 
           # Make PnP as strict as possible
           # https://yarnpkg.com/features/pnp#fallback-mode

.syncpackrc.ts

@@ -30,12 +30,6 @@ export default {
   ],
 
   versionGroups: [
-    // TODO temporary, need to upgrade jiti deps
-    {
-      dependencies: ['jiti'],
-      isIgnored: true,
-    },
-
     {
       label: 'Ignore * deps in type-alias packages',
       packages: [

packages/docusaurus-plugin-content-docs/src/sidebars/index.ts

@@ -88,7 +88,7 @@ async function loadSidebarsFileUnsafe(
   }
 
   // We don't want sidebars to be cached because of hot reloading.
-  const module = await loadFreshModule(sidebarFilePath);
+  const module = await loadFreshModule(sidebarFilePath, {default: true});
 
   // TODO unsafe, need to refactor and improve validation
   return module as SidebarsConfig;

packages/docusaurus-remark-plugin-npm2yarn/src/index.ts

@@ -206,7 +206,4 @@ const plugin: Plugin<[PluginOptions?]> = (options = {}): Transformer => {
   };
 };
 
-// To continue supporting `require('npm2yarn')` without the `.default` ㄟ(▔,▔)ㄏ
-// TODO change to export default after migrating to ESM
-// @ts-expect-error: Docusaurus v4: remove
-export = plugin;
+export default plugin;

packages/docusaurus-utils/package.json

@@ -28,7 +28,7 @@
     "github-slugger": "^1.5.0",
     "globby": "^11.1.0",
     "gray-matter": "^4.0.3",
-    "jiti": "^1.20.0",
+    "jiti": "^2.7.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "micromatch": "^4.0.5",