@docusaurus/core 4.0.0-canary-6899 → 4.0.0-canary-6903

package/lib/commands/build/buildLocale.js

@@ -128,7 +128,6 @@ async function getBuildClientConfig({ props, cliOptions, configureWebpackUtils,
     const result = await (0, client_1.createBuildClientConfig)({
         props,
         minify: cliOptions.minify ?? true,
-        faster: props.siteConfig.future.faster,
         configureWebpackUtils,
     });
     let { config } = result;

package/lib/commands/start/webpack.js

@@ -106,7 +106,6 @@ async function getStartClientConfig({ props, minify, poll, configureWebpackUtils
     let { clientConfig: config } = await (0, client_1.createStartClientConfig)({
         props,
         minify,
-        faster: props.siteConfig.future.faster,
         poll,
         configureWebpackUtils,
     });

package/lib/server/configValidation.js

@@ -46,28 +46,22 @@ exports.DEFAULT_STORAGE_CONFIG = {
     namespace: false,
 };
 exports.DEFAULT_FASTER_CONFIG = {
-    swcJsMinimizer: false,
     rspackBundler: false,
-    rspackPersistentCache: false,
 };
 // When using the "faster: true" shortcut
 exports.DEFAULT_FASTER_CONFIG_TRUE = {
-    swcJsMinimizer: true,
     rspackBundler: true,
-    rspackPersistentCache: true,
 };
 exports.DEFAULT_FUTURE_V4_CONFIG = {
     useCssCascadeLayers: false,
     siteStorageNamespacing: false,
     fasterByDefault: false,
-    mdx1CompatDisabledByDefault: false,
 };
 // When using the "v4: true" shortcut
 exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = {
     useCssCascadeLayers: true,
     siteStorageNamespacing: true,
     fasterByDefault: true,
-    mdx1CompatDisabledByDefault: true,
 };
 exports.DEFAULT_FUTURE_CONFIG = {
     v4: exports.DEFAULT_FUTURE_V4_CONFIG,
@@ -79,11 +73,6 @@ const DEFAULT_MARKDOWN_HOOKS = {
     onBrokenMarkdownImages: 'throw',
     onUnusedMarkdownDirectives: 'warn',
 };
-const DEFAULT_MARKDOWN_MDX1COMPAT = {
-    comments: true,
-    admonitions: true,
-    headingIds: true,
-};
 const DEFAULT_MARKDOWN_CONFIG = {
     // TODO Docusaurus v5: change this to "detect"?
     //  we probably need stable CommonMark support first
@@ -93,7 +82,11 @@ const DEFAULT_MARKDOWN_CONFIG = {
     emoji: true,
     preprocessor: undefined,
     parseFrontMatter: utils_1.DEFAULT_PARSE_FRONT_MATTER,
-    mdx1Compat: DEFAULT_MARKDOWN_MDX1COMPAT,
+    mdx1Compat: {
+        comments: false,
+        admonitions: false,
+        headingIds: false,
+    },
     anchors: {
         maintainCase: false,
     },
@@ -198,9 +191,7 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 // the future.v4.fasterByDefault flag
 const FASTER_CONFIG_SCHEMA = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.object({
-    swcJsMinimizer: utils_validation_1.Joi.boolean(),
     rspackBundler: utils_validation_1.Joi.boolean(),
-    rspackPersistentCache: utils_validation_1.Joi.boolean(),
     swcJsLoader: utils_validation_1.Joi.any()
         .forbidden()
         .messages({
@@ -215,7 +206,6 @@ const FUTURE_V4_SCHEMA = utils_validation_1.Joi.alternatives()
     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),
-    mdx1CompatDisabledByDefault: utils_validation_1.Joi.boolean().default(exports.DEFAULT_FUTURE_V4_CONFIG.mdx1CompatDisabledByDefault),
 }), utils_validation_1.Joi.boolean()
     .required()
     .custom((bool) => bool ? exports.DEFAULT_FUTURE_V4_CONFIG_TRUE : exports.DEFAULT_FUTURE_V4_CONFIG))
@@ -372,14 +362,11 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
             .arity(1)
             .optional()
             .default(() => exports.DEFAULT_CONFIG.markdown.preprocessor),
-        // Individual boolean defaults are not set here on purpose
-        // They are resolved in postProcessDocusaurusConfig based on
-        // the future.v4.mdx1CompatDisabledByDefault flag
         mdx1Compat: utils_validation_1.Joi.object({
-            comments: utils_validation_1.Joi.boolean(),
-            admonitions: utils_validation_1.Joi.boolean(),
-            headingIds: utils_validation_1.Joi.boolean(),
-        }).default({}),
+            comments: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mdx1Compat.comments),
+            admonitions: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mdx1Compat.admonitions),
+            headingIds: utils_validation_1.Joi.boolean().default(exports.DEFAULT_CONFIG.markdown.mdx1Compat.headingIds),
+        }).default(exports.DEFAULT_CONFIG.markdown.mdx1Compat),
         remarkRehypeOptions: 
         // add proper external options validation?
         // Not sure if it's a good idea, validation is likely to become stale
@@ -399,19 +386,13 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
                 .try(utils_validation_1.Joi.string().equal('ignore', 'log', 'warn', 'throw'), utils_validation_1.Joi.function())
                 .default(exports.DEFAULT_CONFIG.markdown.hooks.onUnusedMarkdownDirectives),
         }).default(exports.DEFAULT_CONFIG.markdown.hooks),
-    }).default({
-        ...exports.DEFAULT_CONFIG.markdown,
-        mdx1Compat: {
-        // erased on purpose, filled using postprocessing
-        },
-    }),
+    }).default(exports.DEFAULT_CONFIG.markdown),
 }).messages({
     'docusaurus.configValidationWarning': 'Docusaurus config validation warning. Field {#label}: {#warningMessage}',
 });
 // 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) {
-    var _a;
     // Resolve storage.namespace based on the v4 future flag
     // undefined means "not explicitly set by user"
     if (config.storage.namespace === undefined) {
@@ -429,13 +410,6 @@ function postProcessDocusaurusConfig(config) {
             config.future.faster[key] = fasterDefault;
         }
     }
-    // Resolve mdx1Compat config based on the v4.mdx1CompatDisabledByDefault flag
-    // undefined means "not explicitly set by user"
-    const mdx1CompatDefault = !config.future.v4.mdx1CompatDisabledByDefault;
-    const mdx1CompatKeys = Object.keys(DEFAULT_MARKDOWN_MDX1COMPAT);
-    for (const key of mdx1CompatKeys) {
-        (_a = config.markdown.mdx1Compat)[key] ?? (_a[key] = mdx1CompatDefault);
-    }
     if (config.onBrokenMarkdownLinks) {
         logger_1.default.warn `The code=${'siteConfig.onBrokenMarkdownLinks'} config option is deprecated and will be removed in Docusaurus v4.
 Please migrate and move this option to code=${'siteConfig.markdown.hooks.onBrokenMarkdownLinks'} instead.`;
@@ -444,10 +418,6 @@ Please migrate and move this option to code=${'siteConfig.markdown.hooks.onBroke
         // We erase the former one to ensure we don't use it anywhere
         config.onBrokenMarkdownLinks = undefined;
     }
-    if (config.future.faster.rspackPersistentCache &&
-        !config.future.faster.rspackBundler) {
-        throw new Error(`Docusaurus config flag ${logger_1.default.code('future.faster.rspackPersistentCache')} requires the flag ${logger_1.default.code('future.faster.rspackBundler')} to be turned on.`);
-    }
 }
 // TODO move to @docusaurus/utils-validation
 function validateConfig(config, siteConfigPath) {

package/lib/ssg/ssgRenderer.js

@@ -41,7 +41,7 @@ async function loadSSGRenderer({ params, }) {
         logger_1.PerfLogger.async('Load App renderer', () => loadAppRenderer({
             serverBundlePath: params.serverBundlePath,
         })),
-        logger_1.PerfLogger.async('Load HTML minifier', () => (0, bundler_1.getHtmlMinifier)({ type: 'swc' })),
+        logger_1.PerfLogger.async('Load HTML minifier', () => (0, bundler_1.getHtmlMinifier)()),
         logger_1.PerfLogger.async('Compile SSG template', () => (0, ssgTemplate_1.compileSSGTemplate)(params.ssgTemplateContent)),
     ]);
     return {

package/lib/webpack/base.d.ts

@@ -5,13 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 import type { Configuration } from 'webpack';
-import type { ConfigureWebpackUtils, FasterConfig, Props } from '@docusaurus/types';
+import type { ConfigureWebpackUtils, Props } from '@docusaurus/types';
 export declare const clientDir: string;
 export declare function excludeJS(modulePath: string): boolean;
-export declare function createBaseConfig({ props, isServer, minify, faster, configureWebpackUtils, }: {
+export declare function createBaseConfig({ props, isServer, minify, configureWebpackUtils, }: {
     props: Props;
     isServer: boolean;
     minify: boolean;
-    faster: FasterConfig;
     configureWebpackUtils: ConfigureWebpackUtils;
 }): Promise<Configuration>;

package/lib/webpack/base.js

@@ -41,7 +41,7 @@ function excludeJS(modulePath) {
     return (modulePath.includes('node_modules') &&
         !/docusaurus(?:(?!node_modules).)*\.jsx?$/.test(modulePath));
 }
-async function createBaseConfig({ props, isServer, minify, faster, configureWebpackUtils, }) {
+async function createBaseConfig({ props, isServer, minify, configureWebpackUtils, }) {
     const { outDir, siteDir, siteConfig, siteConfigPath, baseUrl, generatedFilesDir, routesPaths, siteMetadata, plugins, } = props;
     const totalPages = routesPaths.length;
     const isProd = process.env.NODE_ENV === 'production';
@@ -86,19 +86,14 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
             return disabledPersistentCacheValue;
         }
         if (props.currentBundler.name === 'rspack') {
-            if (props.siteConfig.future.faster.rspackPersistentCache) {
-                return {
-                    type: 'persistent',
-                    // Rspack doesn't have "cache.name" like Webpack
-                    // This is not ideal but work around is to merge name/version
-                    // See https://github.com/web-infra-dev/rspack/pull/8920#issuecomment-2658938695
-                    version: `${getCacheName()}-${getCacheVersion()}`,
-                    buildDependencies: getCacheBuildDependencies(),
-                };
-            }
-            else {
-                return disabledPersistentCacheValue;
-            }
+            return {
+                type: 'persistent',
+                // Rspack doesn't have "cache.name" like Webpack
+                // This is not ideal but work around is to merge name/version
+                // See https://github.com/web-infra-dev/rspack/pull/8920#issuecomment-2658938695
+                version: `${getCacheName()}-${getCacheVersion()}`,
+                buildDependencies: getCacheBuildDependencies(),
+            };
         }
         return {
             type: 'filesystem',
@@ -172,7 +167,7 @@ async function createBaseConfig({ props, isServer, minify, faster, configureWebp
             // used for static site generation
             minimize: minimizeEnabled,
             minimizer: minimizeEnabled
-                ? await (0, bundler_1.getMinimizers)({ faster, currentBundler: props.currentBundler })
+                ? await (0, bundler_1.getMinimizers)({ currentBundler: props.currentBundler })
                 : undefined,
             splitChunks: isServer
                 ? false

package/lib/webpack/client.d.ts

@@ -4,21 +4,19 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import type { ConfigureWebpackUtils, FasterConfig, Props } from '@docusaurus/types';
+import type { ConfigureWebpackUtils, Props } from '@docusaurus/types';
 import type { Configuration } from 'webpack';
-export declare function createStartClientConfig({ props, minify, poll, faster, configureWebpackUtils, }: {
+export declare function createStartClientConfig({ props, minify, poll, configureWebpackUtils, }: {
     props: Props;
     minify: boolean;
     poll: number | boolean | undefined;
-    faster: FasterConfig;
     configureWebpackUtils: ConfigureWebpackUtils;
 }): Promise<{
     clientConfig: Configuration;
 }>;
-export declare function createBuildClientConfig({ props, minify, faster, configureWebpackUtils, }: {
+export declare function createBuildClientConfig({ props, minify, configureWebpackUtils, }: {
     props: Props;
     minify: boolean;
-    faster: FasterConfig;
     configureWebpackUtils: ConfigureWebpackUtils;
 }): Promise<{
     config: Configuration;

package/lib/webpack/client.js

@@ -20,12 +20,11 @@ const ForceTerminatePlugin_1 = tslib_1.__importDefault(require("./plugins/ForceT
 const DevHtmlPlugin_1 = tslib_1.__importDefault(require("./plugins/DevHtmlPlugin"));
 const StaticDirectoriesCopyPlugin_1 = require("./plugins/StaticDirectoriesCopyPlugin");
 const dev_html_template_1 = require("./templates/dev.html.template");
-async function createBaseClientConfig({ props, hydrate, minify, faster, configureWebpackUtils, }) {
+async function createBaseClientConfig({ props, hydrate, minify, configureWebpackUtils, }) {
     const baseConfig = await (0, base_1.createBaseConfig)({
         props,
         isServer: false,
         minify,
-        faster,
         configureWebpackUtils,
     });
     const ProgressBarPlugin = await (0, bundler_1.getProgressBarPlugin)({
@@ -57,13 +56,12 @@ async function createBaseClientConfig({ props, hydrate, minify, faster, configur
     });
 }
 // client config when running "docusaurus start"
-async function createStartClientConfig({ props, minify, poll, faster, configureWebpackUtils, }) {
+async function createStartClientConfig({ props, minify, poll, configureWebpackUtils, }) {
     const { siteConfig, headTags, preBodyTags, postBodyTags } = props;
     const clientConfig = (0, webpack_merge_1.default)(await createBaseClientConfig({
         props,
         minify,
         hydrate: false,
-        faster,
         configureWebpackUtils,
     }), {
         watchOptions: {
@@ -92,7 +90,7 @@ async function createStartClientConfig({ props, minify, poll, faster, configureW
     return { clientConfig };
 }
 // client config when running "docusaurus build"
-async function createBuildClientConfig({ props, minify, faster, configureWebpackUtils, }) {
+async function createBuildClientConfig({ props, minify, configureWebpackUtils, }) {
     // Apply user webpack config.
     const { generatedFilesDir, siteConfig } = props;
     const router = siteConfig.future.experimental_router;
@@ -103,7 +101,6 @@ async function createBuildClientConfig({ props, minify, faster, configureWebpack
     const config = (0, webpack_merge_1.default)(await createBaseClientConfig({
         props,
         minify,
-        faster,
         configureWebpackUtils,
         hydrate,
     }), {

package/lib/webpack/server.js

@@ -18,7 +18,6 @@ async function createServerConfig({ props, configureWebpackUtils, }) {
         props,
         isServer: true,
         minify: false,
-        faster: props.siteConfig.future.faster,
         configureWebpackUtils,
     });
     const ProgressBarPlugin = await (0, bundler_1.getProgressBarPlugin)({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6899",
+  "version": "4.0.0-canary-6903",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,15 +33,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6899",
-    "@docusaurus/bundler": "4.0.0-canary-6899",
-    "@docusaurus/fs": "4.0.0-canary-6899",
-    "@docusaurus/glob": "4.0.0-canary-6899",
-    "@docusaurus/logger": "4.0.0-canary-6899",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6899",
-    "@docusaurus/utils": "4.0.0-canary-6899",
-    "@docusaurus/utils-common": "4.0.0-canary-6899",
-    "@docusaurus/utils-validation": "4.0.0-canary-6899",
+    "@docusaurus/babel": "4.0.0-canary-6903",
+    "@docusaurus/bundler": "4.0.0-canary-6903",
+    "@docusaurus/fs": "4.0.0-canary-6903",
+    "@docusaurus/glob": "4.0.0-canary-6903",
+    "@docusaurus/logger": "4.0.0-canary-6903",
+    "@docusaurus/mdx-loader": "4.0.0-canary-6903",
+    "@docusaurus/utils": "4.0.0-canary-6903",
+    "@docusaurus/utils-common": "4.0.0-canary-6903",
+    "@docusaurus/utils-validation": "4.0.0-canary-6903",
     "boxen": "^9.0.0",
     "cli-table3": "^0.6.5",
     "combine-promises": "^1.2.0",
@@ -72,8 +72,8 @@
     "webpack-merge": "^6.0.1"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "4.0.0-canary-6899",
-    "@docusaurus/types": "4.0.0-canary-6899",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6903",
+    "@docusaurus/types": "4.0.0-canary-6903",
     "@total-typescript/shoehorn": "^0.1.2",
     "@types/escape-html": "^1.0.4",
     "@types/history": "^4.7.11",
@@ -87,7 +87,7 @@
     "utility-types": "^3.11.0"
   },
   "peerDependencies": {
-    "@docusaurus/faster": "4.0.0-canary-6899",
+    "@docusaurus/faster": "4.0.0-canary-6903",
     "@mdx-js/react": "^3.1.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0"
@@ -100,5 +100,5 @@
   "engines": {
     "node": ">=24.21"
   },
-  "gitHead": "72622a2308261a457ca37d1e090d3efe608558cc"
+  "gitHead": "01c23721ed00c463fedb89cf012d55e0c7e1ed7c"
 }