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

package/lib/server/configValidation.d.ts

@@ -13,6 +13,6 @@ 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;
-export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'storage' | 'future' | 'onBrokenLinks' | 'onBrokenAnchors' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'headTags' | 'stylesheets' | 'scripts' | 'clientModules' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories' | 'markdown'>;
+export declare const DEFAULT_CONFIG: Pick<DocusaurusConfig, 'i18n' | 'storage' | 'vcs' | 'future' | 'onBrokenLinks' | 'onBrokenAnchors' | 'onBrokenMarkdownLinks' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'headTags' | 'stylesheets' | 'scripts' | 'clientModules' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories' | 'markdown'>;
 export declare const ConfigSchema: Joi.ObjectSchema<DocusaurusConfig>;
 export declare function validateConfig(config: unknown, siteConfigPath: string): DocusaurusConfig;

package/lib/server/configValidation.js

@@ -47,18 +47,14 @@ exports.DEFAULT_STORAGE_CONFIG = {
 };
 exports.DEFAULT_FASTER_CONFIG = {
     swcJsMinimizer: false,
-    swcHtmlMinimizer: false,
     rspackBundler: false,
     rspackPersistentCache: false,
-    gitEagerVcs: false,
 };
 // When using the "faster: true" shortcut
 exports.DEFAULT_FASTER_CONFIG_TRUE = {
     swcJsMinimizer: true,
-    swcHtmlMinimizer: true,
     rspackBundler: true,
     rspackPersistentCache: true,
-    gitEagerVcs: true,
 };
 exports.DEFAULT_FUTURE_V4_CONFIG = {
     useCssCascadeLayers: false,
@@ -76,7 +72,6 @@ exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = {
 exports.DEFAULT_FUTURE_CONFIG = {
     v4: exports.DEFAULT_FUTURE_V4_CONFIG,
     faster: exports.DEFAULT_FASTER_CONFIG,
-    experimental_vcs: (0, utils_1.getVcsPreset)('default-v1'),
     experimental_router: 'browser',
 };
 const DEFAULT_MARKDOWN_HOOKS = {
@@ -108,6 +103,7 @@ const DEFAULT_MARKDOWN_CONFIG = {
 exports.DEFAULT_CONFIG = {
     i18n: exports.DEFAULT_I18N_CONFIG,
     storage: exports.DEFAULT_STORAGE_CONFIG,
+    vcs: (0, utils_1.getVcsPreset)('default'),
     future: exports.DEFAULT_FUTURE_CONFIG,
     onBrokenLinks: 'throw',
     onBrokenAnchors: 'warn', // TODO Docusaurus v4: change to throw
@@ -203,10 +199,8 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 const FASTER_CONFIG_SCHEMA = utils_validation_1.Joi.alternatives()
     .try(utils_validation_1.Joi.object({
     swcJsMinimizer: utils_validation_1.Joi.boolean(),
-    swcHtmlMinimizer: utils_validation_1.Joi.boolean(),
     rspackBundler: utils_validation_1.Joi.boolean(),
     rspackPersistentCache: utils_validation_1.Joi.boolean(),
-    gitEagerVcs: utils_validation_1.Joi.boolean(),
     swcJsLoader: utils_validation_1.Joi.any()
         .forbidden()
         .messages({
@@ -254,22 +248,17 @@ const VCS_CONFIG_SCHEMA = utils_validation_1.Joi.custom((input) => {
         return (0, utils_1.getVcsPreset)(presetName);
     }
     if (typeof input === 'boolean') {
-        // We return the boolean on purpose
-        // We'll normalize it to a real VcsConfig later
-        // This is annoying, but we have to read the future flag to switch to the
-        // new "default-v2" config (not easy to do it here)
-        return input;
+        return input ? (0, utils_1.getVcsPreset)('default') : (0, utils_1.getVcsPreset)('disabled');
     }
     const { error, value } = VCS_CONFIG_OBJECT_SCHEMA.validate(input);
     if (error) {
         throw error;
     }
     return value;
-}).default(true);
+}).default(() => exports.DEFAULT_CONFIG.vcs);
 const FUTURE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
     v4: FUTURE_V4_SCHEMA,
     faster: FASTER_CONFIG_SCHEMA,
-    experimental_vcs: VCS_CONFIG_SCHEMA,
     experimental_router: utils_validation_1.Joi.string()
         .equal('browser', 'hash')
         .default(exports.DEFAULT_FUTURE_CONFIG.experimental_router),
@@ -296,6 +285,7 @@ exports.ConfigSchema = utils_validation_1.Joi.object({
     trailingSlash: utils_validation_1.Joi.boolean(), // No default value! undefined = retrocompatible legacy behavior!
     i18n: I18N_CONFIG_SCHEMA,
     storage: STORAGE_CONFIG_SCHEMA,
+    vcs: VCS_CONFIG_SCHEMA,
     future: FUTURE_CONFIG_SCHEMA,
     onBrokenLinks: utils_validation_1.Joi.string()
         .equal('ignore', 'log', 'warn', 'throw')
@@ -454,15 +444,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;
     }
-    // We normalize the VCS config when using a boolean value
-    if (typeof config.future.experimental_vcs === 'boolean') {
-        const vcsConfig = config.future.experimental_vcs
-            ? config.future.faster.gitEagerVcs
-                ? (0, utils_1.getVcsPreset)('default-v2')
-                : (0, utils_1.getVcsPreset)('default-v1')
-            : (0, utils_1.getVcsPreset)('disabled');
-        config.future.experimental_vcs = vcsConfig;
-    }
     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.`);

package/lib/server/site.js

@@ -49,7 +49,7 @@ async function loadContext(params) {
     // VCS initialization can be slow for large repos, and we don't want to block
     // VCS integrations should be carefully designed to avoid blocking
     logger_1.PerfLogger.async('VCS init', () => {
-        return initialSiteConfig.future.experimental_vcs.initialize({ siteDir });
+        return initialSiteConfig.vcs.initialize({ siteDir });
     });
     const currentBundler = await (0, bundler_1.getCurrentBundler)({
         siteConfig: initialSiteConfig,

package/lib/ssg/ssgParams.d.ts

@@ -6,7 +6,6 @@
  */
 import type { Manifest } from 'react-loadable-ssr-addon-v5-slorber';
 import type { Props } from '@docusaurus/types';
-import type { HtmlMinifierType } from '@docusaurus/bundler';
 export type SSGParams = {
     trailingSlash: boolean | undefined;
     manifest: Manifest;
@@ -17,7 +16,6 @@ export type SSGParams = {
     baseUrl: string;
     noIndex: boolean;
     DOCUSAURUS_VERSION: string;
-    htmlMinifierType: HtmlMinifierType;
     serverBundlePath: string;
     ssgTemplateContent: string;
 };

package/lib/ssg/ssgParams.js

@@ -26,9 +26,6 @@ async function createSSGParams({ props, serverBundlePath, clientManifestPath, })
         noIndex: props.siteConfig.noIndex,
         DOCUSAURUS_VERSION: utils_1.DOCUSAURUS_VERSION,
         serverBundlePath,
-        htmlMinifierType: props.siteConfig.future.faster.swcHtmlMinimizer
-            ? 'swc'
-            : 'terser',
     };
     // Useless but ensures that SSG params remain serializable
     return structuredClone(params);

package/lib/ssg/ssgRenderer.js

@@ -41,9 +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: params.htmlMinifierType,
-        })),
+        logger_1.PerfLogger.async('Load HTML minifier', () => (0, bundler_1.getHtmlMinifier)({ type: 'swc' })),
         logger_1.PerfLogger.async('Compile SSG template', () => (0, ssgTemplate_1.compileSSGTemplate)(params.ssgTemplateContent)),
     ]);
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@docusaurus/core",
   "description": "Easy to Maintain Open Source Documentation Websites",
-  "version": "4.0.0-canary-6896",
+  "version": "4.0.0-canary-6899",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -33,15 +33,15 @@
     "url": "https://github.com/facebook/docusaurus/issues"
   },
   "dependencies": {
-    "@docusaurus/babel": "4.0.0-canary-6896",
-    "@docusaurus/bundler": "4.0.0-canary-6896",
-    "@docusaurus/fs": "4.0.0-canary-6896",
-    "@docusaurus/glob": "4.0.0-canary-6896",
-    "@docusaurus/logger": "4.0.0-canary-6896",
-    "@docusaurus/mdx-loader": "4.0.0-canary-6896",
-    "@docusaurus/utils": "4.0.0-canary-6896",
-    "@docusaurus/utils-common": "4.0.0-canary-6896",
-    "@docusaurus/utils-validation": "4.0.0-canary-6896",
+    "@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",
     "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-6896",
-    "@docusaurus/types": "4.0.0-canary-6896",
+    "@docusaurus/module-type-aliases": "4.0.0-canary-6899",
+    "@docusaurus/types": "4.0.0-canary-6899",
     "@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-6896",
+    "@docusaurus/faster": "4.0.0-canary-6899",
     "@mdx-js/react": "^3.1.1",
     "react": "^19.3.0",
     "react-dom": "^19.3.0"
@@ -100,5 +100,5 @@
   "engines": {
     "node": ">=24.21"
   },
-  "gitHead": "ff0fc69d74156d041b6ddfd675f19ad7c461a26c"
+  "gitHead": "72622a2308261a457ca37d1e090d3efe608558cc"
 }