@docusaurus/core 4.0.0-canary-6905 → 4.0.0-canary-6909

package/lib/commands/start/webpack.d.ts

@@ -4,6 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+import { RspackDevServer } from '@docusaurus/bundler';
 import WebpackDevServer from 'webpack-dev-server';
 import type { StartCLIOptions } from './start';
 import type { Props } from '@docusaurus/types';
@@ -12,4 +13,4 @@ export declare function createWebpackDevServer({ props, cliOptions, openUrlConte
     props: Props;
     cliOptions: StartCLIOptions;
     openUrlContext: OpenUrlContext;
-}): Promise<WebpackDevServer>;
+}): Promise<WebpackDevServer | RspackDevServer>;

package/lib/commands/start/webpack.js

@@ -147,9 +147,6 @@ async function createDevServer({ devServerConfig, compiler, currentBundler, }) {
     if (currentBundler.name === 'webpack') {
         return new webpack_dev_server_1.default(devServerConfig, compiler);
     }
-    else {
-        const RspackDevServer = await (0, bundler_1.importRspackDevServer)();
-        // @ts-expect-error: different types
-        return new RspackDevServer(devServerConfig, compiler);
-    }
+    // Docusaurus bundler configs are typed with Webpack types
+    return new bundler_1.RspackDevServer(devServerConfig, compiler);
 }

package/lib/server/configValidation.d.ts

@@ -5,11 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 import { Joi } from '@docusaurus/utils-validation';
-import type { DocusaurusConfig, FasterConfig, FutureConfig, FutureV4Config, I18nConfig, StorageConfig } from '@docusaurus/types';
+import type { DocusaurusConfig, FutureConfig, FutureV4Config, I18nConfig, StorageConfig } from '@docusaurus/types';
 export declare const DEFAULT_I18N_CONFIG: I18nConfig;
 export declare const DEFAULT_STORAGE_CONFIG: StorageConfig;
-export declare const DEFAULT_FASTER_CONFIG: FasterConfig;
-export declare const DEFAULT_FASTER_CONFIG_TRUE: FasterConfig;
 export declare const DEFAULT_FUTURE_V4_CONFIG: FutureV4Config;
 export declare const DEFAULT_FUTURE_V4_CONFIG_TRUE: FutureV4Config;
 export declare const DEFAULT_FUTURE_CONFIG: FutureConfig;

package/lib/server/configValidation.js

@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_FUTURE_CONFIG = exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = exports.DEFAULT_FUTURE_V4_CONFIG = exports.DEFAULT_FASTER_CONFIG_TRUE = exports.DEFAULT_FASTER_CONFIG = exports.DEFAULT_STORAGE_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
+exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_FUTURE_CONFIG = exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = exports.DEFAULT_FUTURE_V4_CONFIG = exports.DEFAULT_STORAGE_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
 exports.validateConfig = validateConfig;
 const tslib_1 = require("tslib");
 const utils_1 = require("@docusaurus/utils");
@@ -43,29 +43,17 @@ exports.DEFAULT_I18N_CONFIG = {
 };
 exports.DEFAULT_STORAGE_CONFIG = {
     type: 'localStorage',
-    namespace: false,
-};
-exports.DEFAULT_FASTER_CONFIG = {
-    rspackBundler: false,
-};
-// When using the "faster: true" shortcut
-exports.DEFAULT_FASTER_CONFIG_TRUE = {
-    rspackBundler: true,
+    namespace: true,
 };
 exports.DEFAULT_FUTURE_V4_CONFIG = {
     useCssCascadeLayers: false,
-    siteStorageNamespacing: false,
-    fasterByDefault: false,
 };
 // When using the "v4: true" shortcut
 exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = {
     useCssCascadeLayers: true,
-    siteStorageNamespacing: true,
-    fasterByDefault: true,
 };
 exports.DEFAULT_FUTURE_CONFIG = {
     v4: exports.DEFAULT_FUTURE_V4_CONFIG,
-    faster: exports.DEFAULT_FASTER_CONFIG,
     experimental_router: 'browser',
 };
 const DEFAULT_MARKDOWN_HOOKS = {
@@ -185,26 +173,9 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 })
     .optional()
     .default(exports.DEFAULT_I18N_CONFIG);
-// Individual boolean defaults are not set here on purpose
-// They are resolved in postProcessDocusaurusConfig based on
-// the future.v4.fasterByDefault flag
-const FASTER_CONFIG_SCHEMA = utils_validation_1.Joi.alternatives()
-    .try(utils_validation_1.Joi.object({
-    rspackBundler: utils_validation_1.Joi.boolean(),
-    swcJsLoader: utils_validation_1.Joi.any()
-        .forbidden()
-        .messages({
-        'any.unknown': `The Docusaurus config ${logger_1.default.code('future.faster.swcJsLoader')} has been removed. Rspack always uses its built-in SWC loader. Webpack uses Babel by default, and you can provide a custom JS loader with ${logger_1.default.code('siteConfig.webpack.jsLoader')}.`,
-    }),
-}), utils_validation_1.Joi.boolean()
-    .required()
-    .custom((bool) => bool ? exports.DEFAULT_FASTER_CONFIG_TRUE : exports.DEFAULT_FASTER_CONFIG))
-    .optional();
 const FUTURE_V4_SCHEMA = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.object({
     useCssCascadeLayers: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FUTURE_V4_CONFIG.useCssCascadeLayers),
-    siteStorageNamespacing: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FUTURE_V4_CONFIG.siteStorageNamespacing),
-    fasterByDefault: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FUTURE_V4_CONFIG.fasterByDefault),
 }), utils_validation_1.Joi.boolean()
     .required()
     .custom((bool) => bool ? exports.DEFAULT_FUTURE_V4_CONFIG_TRUE : exports.DEFAULT_FUTURE_V4_CONFIG))
@@ -214,13 +185,12 @@ const STORAGE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     type: utils_validation_1.Joi.string()
         .equal('localStorage', 'sessionStorage')
         .default(exports.DEFAULT_STORAGE_CONFIG.type),
-    // namespace default is not set here on purpose
-    // It is resolved in postProcessDocusaurusConfig based on
-    // the future.v4.siteStorageNamespacing flag
-    namespace: utils_validation_1.Joi.alternatives().try(utils_validation_1.Joi.string(), utils_validation_1.Joi.boolean()),
+    namespace: utils_validation_1.Joi.alternatives()
+        .try(utils_validation_1.Joi.string(), utils_validation_1.Joi.boolean())
+        .default(exports.DEFAULT_STORAGE_CONFIG.namespace),
 })
     .optional()
-    .default({ type: exports.DEFAULT_STORAGE_CONFIG.type });
+    .default(exports.DEFAULT_STORAGE_CONFIG);
 const VCS_CONFIG_OBJECT_SCHEMA = utils_validation_1.Joi.object({
     // All the fields are required on purpose
     // You either provide a full VCS config or nothing
@@ -247,7 +217,11 @@ const VCS_CONFIG_SCHEMA = utils_validation_1.Joi.custom((input) => {
 }).default(() => exports.DEFAULT_CONFIG.vcs);
 const FUTURE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     v4: FUTURE_V4_SCHEMA,
-    faster: FASTER_CONFIG_SCHEMA,
+    faster: utils_validation_1.Joi.any()
+        .forbidden()
+        .messages({
+        'any.unknown': `The Docusaurus config ${logger_1.default.code('future.faster')} has been removed. Docusaurus now uses Rspack by default. To keep using Webpack and Babel (deprecated), use ${logger_1.default.code('siteConfig.webpack: true')}.`,
+    }),
     experimental_router: utils_validation_1.Joi.string()
         .equal('browser', 'hash')
         .default(exports.DEFAULT_FUTURE_CONFIG.experimental_router),
@@ -259,7 +233,7 @@ const FUTURE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     experimental_faster: utils_validation_1.Joi.any()
         .forbidden()
         .messages({
-        'any.unknown': `The Docusaurus config ${logger_1.default.code('future.experimental_faster')} has been renamed to ${logger_1.default.code('future.faster')}. Please update your Docusaurus config.`,
+        'any.unknown': `The Docusaurus config ${logger_1.default.code('future.experimental_faster')} has been removed. Docusaurus now uses Rspack by default. To keep using Webpack and Babel (deprecated), use ${logger_1.default.code('siteConfig.webpack: true')}.`,
     }),
 })
     .optional()
@@ -347,11 +321,14 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     tagline: utils_validation_1.Joi.string().allow('').default(exports.DEFAULT_CONFIG.tagline),
     titleDelimiter: utils_validation_1.Joi.string().default(exports.DEFAULT_CONFIG.titleDelimiter),
     noIndex: utils_validation_1.Joi.bool().default(exports.DEFAULT_CONFIG.noIndex),
-    webpack: utils_validation_1.Joi.object({
+    // Normalized in postProcessDocusaurusConfig
+    webpack: utils_validation_1.Joi.alternatives()
+        .try(utils_validation_1.Joi.boolean(), utils_validation_1.Joi.object({
         jsLoader: utils_validation_1.Joi.alternatives()
             .try(utils_validation_1.Joi.string().equal('babel'), utils_validation_1.Joi.function())
             .optional(),
-    }).optional(),
+    }))
+        .optional(),
     markdown: utils_validation_1.Joi.object({
         format: utils_validation_1.Joi.string()
             .equal('mdx', 'md', 'detect')
@@ -394,22 +371,13 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
 // Expressing this kind of logic in Joi is a pain
 // We also want to decouple logic from Joi: easier to remove it later!
 function postProcessDocusaurusConfig(config) {
-    // Resolve storage.namespace based on the v4 future flag
-    // undefined means "not explicitly set by user"
-    if (config.storage.namespace === undefined) {
-        config.storage.namespace = config.future.v4.siteStorageNamespacing;
-    }
-    // Resolve faster config based on the v4.fasterByDefault flag
-    // undefined means "not explicitly set by user"
-    if (config.future.faster === undefined) {
-        config.future.faster = {};
+    // Resolve webpack config: true => {}, false => undefined (Rspack)
+    const webpack = config.webpack;
+    if (webpack === true) {
+        config.webpack = {};
     }
-    const fasterDefault = config.future.v4.fasterByDefault;
-    const fasterKeys = Object.keys(exports.DEFAULT_FASTER_CONFIG);
-    for (const key of fasterKeys) {
-        if (config.future.faster[key] === undefined) {
-            config.future.faster[key] = fasterDefault;
-        }
+    else if (webpack === false) {
+        delete config.webpack;
     }
 }
 // TODO move to @docusaurus/utils-validation

package/lib/server/siteMessages.js

@@ -15,7 +15,8 @@ const babel_1 = require("@docusaurus/babel");
 const logger_1 = tslib_1.__importDefault(require("@docusaurus/logger"));
 const uselessBabelConfigMessages = async ({ site }) => {
     const { props: { siteDir, siteConfig }, } = site;
-    if (siteConfig.future.faster.rspackBundler) {
+    // Babel is only used with Webpack
+    if (!siteConfig.webpack) {
         const babelConfigFilePath = await (0, babel_1.getCustomBabelConfigFilePath)(siteDir);
         if (babelConfigFilePath) {
             return [
@@ -28,8 +29,22 @@ const uselessBabelConfigMessages = async ({ site }) => {
     }
     return [];
 };
+const webpackDeprecationMessages = async ({ site }) => {
+    if (site.props.siteConfig.webpack) {
+        return [
+            {
+                type: 'warning',
+                message: `Your site uses Webpack and Babel through ${logger_1.default.code('siteConfig.webpack')}. This is deprecated: Docusaurus now uses Rspack by default, and Webpack/Babel support will be removed in Docusaurus v5. Please remove ${logger_1.default.code('siteConfig.webpack')} to use Rspack.`,
+            },
+        ];
+    }
+    return [];
+};
 async function collectAllSiteMessages(params) {
-    const messageCreators = [uselessBabelConfigMessages];
+    const messageCreators = [
+        uselessBabelConfigMessages,
+        webpackDeprecationMessages,
+    ];
     return (await Promise.all(messageCreators.map((createMessages) => createMessages(params)))).flat();
 }
 function printSiteMessages(siteMessages) {

package/lib/webpack/base.js

@@ -86,7 +86,7 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
             return disabledPersistentCacheValue;
         }
         if (props.currentBundler.name === 'rspack') {
-            return {
+            const rspackCache = {
                 type: 'persistent',
                 // Rspack doesn't have "cache.name" like Webpack
                 // This is not ideal but work around is to merge name/version
@@ -94,6 +94,8 @@ async function createBaseConfig({ props, isServer, minify, configureWebpackUtils
                 version: `${getCacheName()}-${getCacheVersion()}`,
                 buildDependencies: getCacheBuildDependencies(),
             };
+            // Docusaurus bundler configs are typed with Webpack types
+            return rspackCache;
         }
         return {
             type: 'filesystem',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6905",
+  "version": "4.0.0-canary-6909",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,15 +33,17 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6905",
-    "@docusaurus/bundler": "4.0.0-canary-6905",
-    "@docusaurus/fs": "4.0.0-canary-6905",
-    "@docusaurus/glob": "4.0.0-canary-6905",
-    "@docusaurus/logger": "4.0.0-canary-6905",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6905",
-    "@docusaurus/utils": "4.0.0-canary-6905",
-    "@docusaurus/utils-common": "4.0.0-canary-6905",
-    "@docusaurus/utils-validation": "4.0.0-canary-6905",
+    "@docusaurus/babel": "4.0.0-canary-6909",
+    "@docusaurus/bundler": "4.0.0-canary-6909",
+    "@docusaurus/fs": "4.0.0-canary-6909",
+    "@docusaurus/glob": "4.0.0-canary-6909",
+    "@docusaurus/logger": "4.0.0-canary-6909",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6909",
+    "@docusaurus/utils": "4.0.0-canary-6909",
+    "@docusaurus/utils-common": "4.0.0-canary-6909",
+    "@docusaurus/utils-validation": "4.0.0-canary-6909",
+    "@rspack/core": "^2.2.3",
+    "@rspack/dev-server": "^2.2.1",
     "boxen": "^9.0.0",
     "cli-table3": "^0.6.5",
     "combine-promises": "^1.2.0",
@@ -72,8 +74,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6905",
-    "@docusaurus/types": "4.0.0-canary-6905",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6909",
+    "@docusaurus/types": "4.0.0-canary-6909",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",
@@ -94,5 +96,5 @@
   "engines": {
     "node": ">=24.21"
   },
-  "gitHead": "470671a4afe0ffd3cc7baf99475ba2370145f3b1"
+  "gitHead": "5e2a504d84cc304af27b526febd9f9bdb997b290"
 }