[pull] main from facebook:main

.github/workflows/security-supply-chain.yml

@@ -74,6 +74,7 @@ jobs:
           trustPolicyExclude:
             - 'detect-port@1.6.1'
             - 'semver@6.3.1'
+            - 'webpack-dev-middleware@7.4.6'
           YAML
 
           sfw pnpm install || sfw pnpm install || sfw pnpm install

AGENTS.md

@@ -1,16 +1,22 @@
-# Agent Development Guide
+# AGENTS.md
 
-A file for [guiding AI coding agents](https://agents.md/).
+## Docusaurus
 
-## Project Overview
+Overview:
 
-Docusaurus is a modern static site generator framework focused on documentation websites. It's built with React and supports MDX, i18n, versioning, and extensive plugin architecture.
+- Modern static site generator framework - SPA
+- Focus on documentation sites
+- Built with React
+- Supports MDX, i18n, versioning
+- Extensive plugin architecture
+- Uses itself to build its own sites & dogfood
 
-The project is a monorepo managed by Lerna and uses pnpm workspaces.
+Monorepo based on:
 
-Docusaurus uses itself to build its own website, which serves as both documentation and a way to dogfood the framework.
+- Lerna
+- pnpm workspaces
 
-### Monorepo Structure
+### Monorepo
 
 - `packages/` - Core Docusaurus packages and plugins, published to npm
   - `docusaurus/` - Main CLI and core functionality
@@ -21,7 +27,13 @@ Docusaurus uses itself to build its own website, which serves as both documentat
   - `docusaurus-types/` - TypeScript definitions
   - `create-docusaurus/` - Site initialization CLI tool
 
-Monorepo packages depend on each other. Use `pnpm lerna list --toposort` to know in which order to build them, and `pnpm --filter <package-name> build` to build one in particular. Using `pnpm build:packages` builds them all in the correct order, but is slower.
+Packages depend on each other.
+
+Use:
+
+- `pnpm lerna list --toposort` to know in which order to build them
+- `pnpm --filter <package-name> build` to build one in particular
+- `pnpm build:packages` to build them all in the correct order
 
 ### Website structure
 
@@ -43,7 +55,7 @@ The main CLI commands available
 - `pnpm watch` - Incremental build of monorepo packages with file watchers
 - `pnpm format` - Format code with oxfmt
 - `pnpm lint` - Run linting (ESLint + Stylelint + spell check)
-- `pnpm test` - Run all tests using Jest
+- `pnpm test` - Run all tests using Vitest
 - `pnpm clear` - Clean all build artifacts and caches
 - `pnpm --filter <package-name> build` - Build an individual monorepo package
 
@@ -57,13 +69,13 @@ The main CLI commands available
 
 ### Testing
 
-- `pnpm test` - Run all Jest tests
+- `pnpm test` - Run all Vitest tests
 - `pnpm test <path/to/test.file.ts>` - Run single test file
 - `pnpm --filter <package-name> test` - Run tests in a specific package:
 
 When a test is failing, run only that test file until it passes. Make sure to run all tests at the end to ensure there's no unexpected failure in other places.
 
-Update Jest failing snapshots with the `-u` option. Do not blindly update snapshots, and make sure they capture the correct behavior.
+Update Vitest failing snapshots with the `-u` option. Do not blindly update snapshots, and make sure they capture the correct behavior.
 
 ### Linting & Formatting
 

CLAUDE.md

@@ -0,0 +1,3 @@
+# CLAUDE.md
+
+@AGENTS.md

packages/docusaurus-bundler/src/importFaster.ts

@@ -36,6 +36,13 @@ export async function importRspack(): Promise<FasterModule['rspack']> {
   return faster.rspack;
 }
 
+export async function importRspackDevServer(): Promise<
+  FasterModule['rspackDevServer']
+> {
+  const faster = await ensureFaster();
+  return faster.rspackDevServer;
+}
+
 export async function importSwcLoader(): Promise<string> {
   const faster = await ensureFaster();
   return faster.swcLoader;

packages/docusaurus-bundler/src/index.ts

@@ -23,3 +23,4 @@ export {
 } from './minifyHtml';
 export {createJsLoaderFactory} from './loaders/jsLoader';
 export {createStyleLoadersFactory} from './loaders/styleLoader';
+export {importRspackDevServer} from './importFaster';

packages/docusaurus-faster/package.json

@@ -19,7 +19,8 @@
   "license": "MIT",
   "dependencies": {
     "@docusaurus/types": "3.10.1",
-    "@rspack/core": "^2.2.0",
+    "@rspack/core": "^2.2.2",
+    "@rspack/dev-server": "^2.2.1",
     "@swc/core": "^1.15.40",
     "@swc/html": "^1.15.40",
     "browserslist": "^4.28.2",

packages/docusaurus-faster/src/index.ts

@@ -6,6 +6,7 @@
  */
 
 import {rspack as Rspack} from '@rspack/core';
+import {RspackDevServer} from '@rspack/dev-server';
 import * as lightningcss from 'lightningcss';
 import browserslist from 'browserslist';
 import semver from 'semver';
@@ -39,7 +40,9 @@ export const getSwcLoaderOptions = ({
   };
 };
 
-export const rspack: typeof Rspack = Rspack;
+export const rspack = Rspack;
+
+export const rspackDevServer = RspackDevServer;
 
 type SwcHtmlMinifier = (typeof import('@swc/html'))['minify'];
 

packages/docusaurus/package.json

@@ -72,7 +72,7 @@
     "update-notifier": "^6.0.2",
     "webpack": "^5.106.2",
     "webpack-bundle-analyzer": "^5.3.0",
-    "webpack-dev-server": "^5.2.3",
+    "webpack-dev-server": "^6.0.0",
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {

packages/docusaurus/src/commands/start/webpack.ts

@@ -7,10 +7,15 @@
 
 import path from 'path';
 import merge from 'webpack-merge';
-import {formatStatsErrorMessage, printStatsWarnings} from '@docusaurus/bundler';
+import {
+  formatStatsErrorMessage,
+  importRspackDevServer,
+  printStatsWarnings,
+} from '@docusaurus/bundler';
 import logger from '@docusaurus/logger';
-// eslint-disable-next-line import/default
-import WebpackDevServer from 'webpack-dev-server';
+import WebpackDevServer, {
+  type Configuration as DevServerConfig,
+} from 'webpack-dev-server';
 import evalSourceMapMiddleware from '../utils/legacy/evalSourceMapMiddleware';
 import {createPollingOptions} from './watcher';
 import getHttpsConfig from '../../webpack/utils/getHttpsConfig';
@@ -20,7 +25,11 @@ import {
 } from '../../webpack/configure';
 import {createStartClientConfig} from '../../webpack/client';
 import type {StartCLIOptions} from './start';
-import type {ConfigureWebpackUtils, Props} from '@docusaurus/types';
+import type {
+  ConfigureWebpackUtils,
+  CurrentBundler,
+  Props,
+} from '@docusaurus/types';
 import type {Compiler} from 'webpack';
 import type {OpenUrlContext} from './utils';
 
@@ -55,7 +64,7 @@ async function createDevServerConfig({
   props: Props;
   host: string;
   port: number;
-}): Promise<WebpackDevServer.Configuration> {
+}): Promise<DevServerConfig> {
   const {baseUrl, siteDir, siteConfig} = props;
 
   const pollingOptions = createPollingOptions(cliOptions);
@@ -175,17 +184,39 @@ export async function createWebpackDevServer({
   const compiler = props.currentBundler.instance(config);
   registerWebpackE2ETestHook(compiler);
 
-  const defaultDevServerConfig = await createDevServerConfig({
+  const defaultDevServerConfig: DevServerConfig = await createDevServerConfig({
     cliOptions,
     props,
     host: openUrlContext.host,
     port: openUrlContext.port,
   });
 
   // Allow plugin authors to customize/override devServer config
-  const devServerConfig: WebpackDevServer.Configuration = merge(
+  const devServerConfig: DevServerConfig = merge(
     [defaultDevServerConfig, config.devServer].filter(Boolean),
   );
 
-  return new WebpackDevServer(devServerConfig, compiler);
+  return createDevServer({
+    devServerConfig,
+    compiler,
+    currentBundler: props.currentBundler,
+  });
+}
+
+async function createDevServer({
+  devServerConfig,
+  compiler,
+  currentBundler,
+}: {
+  devServerConfig: DevServerConfig;
+  compiler: Compiler;
+  currentBundler: CurrentBundler;
+}): Promise<WebpackDevServer> {
+  if (currentBundler.name === 'webpack') {
+    return new WebpackDevServer(devServerConfig, compiler);
+  } else {
+    const RspackDevServer = await importRspackDevServer();
+    // @ts-expect-error: different types
+    return new RspackDevServer(devServerConfig, compiler);
+  }
 }