[pull] main from facebook:main

packages/docusaurus-bundler/src/minification.ts

@@ -147,12 +147,15 @@ async function getRspackMinimizers({
     bundlerName: 'rspack',
   });
   const swcJsMinimizerOptions = await importSwcJsMinimizerOptions();
+
   return [
     // See https://rspack.dev/plugins/rspack/swc-js-minimizer-rspack-plugin
     // See https://swc.rs/docs/configuration/minification
     new rspack.SwcJsMinimizerRspackPlugin({
       minimizerOptions: {
         minify: true,
+        // @ts-expect-error: annoying type incompatibility
+        ecma: swcJsMinimizerOptions.ecma,
         ...swcJsMinimizerOptions,
       },
     }),

packages/docusaurus-faster/package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/types": "3.9.2",
-    "@rspack/core": "^1.5.0",
+    "@rspack/core": "^1.7.5",
     "@swc/core": "^1.7.39",
     "@swc/html": "^1.13.5",
     "browserslist": "^4.24.2",

packages/docusaurus-mdx-loader/src/remark/toc/utils.ts

@@ -151,6 +151,7 @@ export async function createTOCExportNodeAST({
         body: [
           {
             type: 'ExportNamedDeclaration',
+            attributes: [],
             declaration: {
               type: 'VariableDeclaration',
               declarations: [

packages/docusaurus-plugin-content-blog/package.json

@@ -40,6 +40,7 @@
     "@docusaurus/utils-common": "3.9.2",
     "@docusaurus/utils-validation": "3.9.2",
     "cheerio": "1.0.0-rc.12",
+    "combine-promises": "^1.1.0",
     "feed": "^4.2.2",
     "fs-extra": "^11.1.1",
     "lodash": "^4.17.21",

packages/docusaurus-plugin-content-blog/src/__tests__/feed.test.ts

@@ -13,7 +13,10 @@ import {
   DEFAULT_VCS_CONFIG,
 } from '@docusaurus/utils';
 import {fromPartial} from '@total-typescript/shoehorn';
-import {normalizePluginOptions} from '@docusaurus/utils-validation';
+import {
+  normalizePluginOptions,
+  getTagsFile,
+} from '@docusaurus/utils-validation';
 import tree from 'tree-node-cli';
 import {DEFAULT_OPTIONS, validateOptions} from '../options';
 import {generateBlogPosts} from '../blogUtils';
@@ -84,10 +87,13 @@ async function testGenerateFeeds(
     baseUrl: '/',
   });
 
+  const tagsFile = await getTagsFile({contentPaths, tags: options.tags});
+
   const blogPosts = await generateBlogPosts(
     contentPaths,
     context,
     options,
+    tagsFile,
     authorsMap,
   );
 

packages/docusaurus-plugin-content-blog/src/blogUtils.ts

@@ -26,7 +26,7 @@ import {
   normalizeTags,
   aliasedSitePathToRelativePath,
 } from '@docusaurus/utils';
-import {getTagsFile} from '@docusaurus/utils-validation';
+
 import {validateBlogPostFrontMatter} from './frontMatter';
 import {getBlogPostAuthors} from './authors';
 import {reportAuthorsProblems} from './authorsProblems';
@@ -388,6 +388,7 @@ export async function generateBlogPosts(
   contentPaths: BlogContentPaths,
   context: LoadContext,
   options: PluginOptions,
+  tagsFile: TagsFile | null,
   authorsMap?: AuthorsMap,
 ): Promise<BlogPost[]> {
   const {include, exclude} = options;
@@ -401,10 +402,6 @@ export async function generateBlogPosts(
     ignore: exclude,
   });
 
-  // TODO this should be done outside of this function
-  //  directly in plugin loadContent()
-  const tagsFile = await getTagsFile({contentPaths, tags: options.tags});
-
   async function doProcessBlogSourceFile(blogSourceFile: string) {
     try {
       return await processBlogSourceFile(

packages/docusaurus-plugin-content-blog/src/index.ts

@@ -7,6 +7,8 @@
 
 import path from 'path';
 import logger from '@docusaurus/logger';
+import combinePromises from 'combine-promises';
+
 import {
   normalizeUrl,
   docuHash,
@@ -20,7 +22,10 @@ import {
   resolveMarkdownLinkPathname,
   getLocaleConfig,
 } from '@docusaurus/utils';
-import {getTagsFilePathsToWatch} from '@docusaurus/utils-validation';
+import {
+  getTagsFilePathsToWatch,
+  getTagsFile,
+} from '@docusaurus/utils-validation';
 import {createMDXLoaderItem} from '@docusaurus/mdx-loader';
 import {
   getBlogTags,
@@ -227,22 +232,32 @@ export default async function pluginContentBlog(
       const baseBlogUrl = normalizeUrl([baseUrl, routeBasePath]);
       const blogTagsListPath = normalizeUrl([baseBlogUrl, tagsBasePath]);
 
-      const authorsMap = await getAuthorsMap({
-        contentPaths,
-        authorsMapPath,
-        authorsBaseRoutePath: normalizeUrl([
+      async function getAuthorsMapChecked() {
+        const result = await getAuthorsMap({
+          contentPaths,
+          authorsMapPath,
+          authorsBaseRoutePath: normalizeUrl([
+            baseUrl,
+            routeBasePath,
+            authorsBasePath,
+          ]),
           baseUrl,
-          routeBasePath,
-          authorsBasePath,
-        ]),
-        baseUrl,
+        });
+        checkAuthorsMapPermalinkCollisions(result);
+        return result;
+      }
+
+      // Read all the input files in parallel
+      const {authorsMap, tagsFile} = await combinePromises({
+        authorsMap: getAuthorsMapChecked(),
+        tagsFile: getTagsFile({contentPaths, tags: options.tags}),
       });
-      checkAuthorsMapPermalinkCollisions(authorsMap);
 
       let blogPosts = await generateBlogPosts(
         contentPaths,
         context,
         options,
+        tagsFile,
         authorsMap,
       );
       blogPosts = await applyProcessBlogPosts({

packages/docusaurus-theme-classic/src/theme/Layout/index.tsx

@@ -13,7 +13,6 @@ import {
   SkipToContentFallbackId,
   ThemeClassNames,
 } from '@docusaurus/theme-common';
-import {useKeyboardNavigation} from '@docusaurus/theme-common/internal';
 import SkipToContent from '@theme/SkipToContent';
 import AnnouncementBar from '@theme/AnnouncementBar';
 import Navbar from '@theme/Navbar';
@@ -33,8 +32,6 @@ export default function Layout(props: Props): ReactNode {
     description,
   } = props;
 
-  useKeyboardNavigation();
-
   return (
     <LayoutProvider>
       <PageMetadata title={title} description={description} />

packages/docusaurus-theme-classic/src/theme/SiteMetadata/index.tsx

@@ -13,7 +13,6 @@ import {PageMetadata, useThemeConfig} from '@docusaurus/theme-common';
 import {
   DEFAULT_SEARCH_TAG,
   useAlternatePageUtils,
-  keyboardFocusedClassName,
 } from '@docusaurus/theme-common/internal';
 import {useLocation} from '@docusaurus/router';
 import {applyTrailingSlash} from '@docusaurus/utils-common';
@@ -130,7 +129,7 @@ export default function SiteMetadata(): ReactNode {
         <meta name="twitter:card" content="summary_large_image" />
         {/* The keyboard focus class name need to be applied when SSR so links
         are outlined when JS is disabled */}
-        <body className={keyboardFocusedClassName} />
+        <body />
       </Head>
 
       {defaultImage && <PageMetadata image={defaultImage} />}

packages/docusaurus-theme-common/src/internal.ts

@@ -94,10 +94,6 @@ export {
 export {useDateTimeFormat} from './utils/IntlUtils';
 
 export {useHideableNavbar} from './hooks/useHideableNavbar';
-export {
-  useKeyboardNavigation,
-  keyboardFocusedClassName,
-} from './hooks/useKeyboardNavigation';
 export {useLockBodyScroll} from './hooks/useLockBodyScroll';
 export {useCodeWordWrap} from './hooks/useCodeWordWrap';
 export {useBackToTopButton} from './hooks/useBackToTopButton';

packages/docusaurus/src/webpack/base.ts

@@ -165,26 +165,6 @@ export async function createBaseConfig({
         };
       }
 
-      if (process.env.DISABLE_RSPACK_INCREMENTAL) {
-        // Enabled by default since Rspack 1.4
-        console.log('Rspack incremental disabled');
-        experiments.incremental = false;
-      }
-
-      // See https://rspack.rs/blog/announcing-1-5#barrel-file-optimization
-      if (process.env.DISABLE_RSPACK_LAZY_BARREL) {
-        console.log('Rspack lazyBarrel disabled');
-        experiments.lazyBarrel = false;
-      } else {
-        // TODO remove after we upgrade to Rspack 1.6+
-        //  Enabled by default for Rspack >= 1.6
-        experiments.lazyBarrel = true;
-      }
-
-      // TODO re-enable later, there's an Rspack performance issue
-      //  see https://github.com/facebook/docusaurus/pull/11178
-      experiments.parallelCodeSplitting = false;
-
       return experiments;
     }
     return undefined;

website/docs/i18n/i18n-git.mdx

@@ -112,14 +112,13 @@ Copy your untranslated Markdown files to the French folder:
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-docs/current
-cp -r docs/** i18n/fr/docusaurus-plugin-content-docs/current
+cp -r docs/. i18n/fr/docusaurus-plugin-content-docs/current
 
 mkdir -p i18n/fr/docusaurus-plugin-content-blog
-cp -r blog/** i18n/fr/docusaurus-plugin-content-blog
+cp -r blog/. i18n/fr/docusaurus-plugin-content-blog
 
 mkdir -p i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.md i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.mdx i18n/fr/docusaurus-plugin-content-pages
+cp -r src/pages/. i18n/fr/docusaurus-plugin-content-pages
 ```
 
 Add all these files to Git.

website/docs/i18n/i18n-tutorial.mdx

@@ -400,7 +400,7 @@ Copy your docs Markdown files from `docs/` to `i18n/fr/docusaurus-plugin-content
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-docs/current
-cp -r docs/** i18n/fr/docusaurus-plugin-content-docs/current
+cp -r docs/. i18n/fr/docusaurus-plugin-content-docs/current
 ```
 
 :::info
@@ -415,7 +415,7 @@ Copy your blog Markdown files to `i18n/fr/docusaurus-plugin-content-blog`, and t
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-blog
-cp -r blog/** i18n/fr/docusaurus-plugin-content-blog
+cp -r blog/. i18n/fr/docusaurus-plugin-content-blog
 ```
 
 #### Translate the pages {#translate-the-pages}
@@ -424,8 +424,7 @@ Copy your pages Markdown files to `i18n/fr/docusaurus-plugin-content-pages`, and
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.md i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.mdx i18n/fr/docusaurus-plugin-content-pages
+cp -r src/pages/. i18n/fr/docusaurus-plugin-content-pages
 ```
 
 :::warning

website/versioned_docs/version-2.x/i18n/i18n-git.mdx

@@ -112,14 +112,13 @@ Copy your untranslated Markdown files to the French folder:
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-docs/current
-cp -r docs/** i18n/fr/docusaurus-plugin-content-docs/current
+cp -r docs/. i18n/fr/docusaurus-plugin-content-docs/current
 
 mkdir -p i18n/fr/docusaurus-plugin-content-blog
-cp -r blog/** i18n/fr/docusaurus-plugin-content-blog
+cp -r blog/. i18n/fr/docusaurus-plugin-content-blog
 
 mkdir -p i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.md i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.mdx i18n/fr/docusaurus-plugin-content-pages
+cp -r src/pages/. i18n/fr/docusaurus-plugin-content-pages
 ```
 
 Add all these files to Git.

website/versioned_docs/version-2.x/i18n/i18n-tutorial.mdx

@@ -392,7 +392,7 @@ Copy your docs Markdown files from `docs/` to `i18n/fr/docusaurus-plugin-content
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-docs/current
-cp -r docs/** i18n/fr/docusaurus-plugin-content-docs/current
+cp -r docs/. i18n/fr/docusaurus-plugin-content-docs/current
 ```
 
 :::info
@@ -407,7 +407,7 @@ Copy your blog Markdown files to `i18n/fr/docusaurus-plugin-content-blog`, and t
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-blog
-cp -r blog/** i18n/fr/docusaurus-plugin-content-blog
+cp -r blog/. i18n/fr/docusaurus-plugin-content-blog
 ```
 
 #### Translate the pages {#translate-the-pages}
@@ -416,8 +416,7 @@ Copy your pages Markdown files to `i18n/fr/docusaurus-plugin-content-pages`, and
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.md i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.mdx i18n/fr/docusaurus-plugin-content-pages
+cp -r src/pages/. i18n/fr/docusaurus-plugin-content-pages
 ```
 
 :::warning

website/versioned_docs/version-3.0.1/i18n/i18n-git.mdx

@@ -112,14 +112,13 @@ Copy your untranslated Markdown files to the French folder:
 
 ```bash
 mkdir -p i18n/fr/docusaurus-plugin-content-docs/current
-cp -r docs/** i18n/fr/docusaurus-plugin-content-docs/current
+cp -r docs/. i18n/fr/docusaurus-plugin-content-docs/current
 
 mkdir -p i18n/fr/docusaurus-plugin-content-blog
-cp -r blog/** i18n/fr/docusaurus-plugin-content-blog
+cp -r blog/. i18n/fr/docusaurus-plugin-content-blog
 
 mkdir -p i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.md i18n/fr/docusaurus-plugin-content-pages
-cp -r src/pages/**.mdx i18n/fr/docusaurus-plugin-content-pages
+cp -r src/pages/. i18n/fr/docusaurus-plugin-content-pages
 ```
 
 Add all these files to Git.