@docusaurus/core 4.0.0-canary-6907 → 4.0.0-canary-6911

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, FutureConfig, FutureV4Config, I18nConfig, StorageConfig } from '@docusaurus/types';
+import type { DocusaurusConfig, FutureConfig, I18nConfig, StorageConfig } from '@docusaurus/types';
 export declare const DEFAULT_I18N_CONFIG: I18nConfig;
 export declare const DEFAULT_STORAGE_CONFIG: StorageConfig;
-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' | 'vcs' | 'future' | 'onBrokenLinks' | 'onBrokenAnchors' | 'onDuplicateRoutes' | 'plugins' | 'themes' | 'presets' | 'headTags' | 'stylesheets' | 'scripts' | 'clientModules' | 'customFields' | 'themeConfig' | 'titleDelimiter' | 'noIndex' | 'tagline' | 'baseUrlIssueBanner' | 'staticDirectories' | 'markdown'>;
 export declare const ConfigSchema: Joi.ObjectSchema<DocusaurusConfig & {

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_STORAGE_CONFIG = exports.DEFAULT_I18N_CONFIG = void 0;
+exports.ConfigSchema = exports.DEFAULT_CONFIG = exports.DEFAULT_FUTURE_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,19 +43,9 @@ exports.DEFAULT_I18N_CONFIG = {
 };
 exports.DEFAULT_STORAGE_CONFIG = {
     type: 'localStorage',
-    namespace: false,
-};
-exports.DEFAULT_FUTURE_V4_CONFIG = {
-    useCssCascadeLayers: false,
-    siteStorageNamespacing: false,
-};
-// When using the "v4: true" shortcut
-exports.DEFAULT_FUTURE_V4_CONFIG_TRUE = {
-    useCssCascadeLayers: true,
-    siteStorageNamespacing: true,
+    namespace: true,
 };
 exports.DEFAULT_FUTURE_CONFIG = {
-    v4: exports.DEFAULT_FUTURE_V4_CONFIG,
     experimental_router: 'browser',
 };
 const DEFAULT_MARKDOWN_HOOKS = {
@@ -175,26 +165,16 @@ const I18N_CONFIG_SCHEMA = utils_validation_1.Joi.object({
 })
     .optional()
     .default(exports.DEFAULT_I18N_CONFIG);
-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),
-}), utils_validation_1.Joi.boolean()
-    .required()
-    .custom((bool) => bool ? exports.DEFAULT_FUTURE_V4_CONFIG_TRUE : exports.DEFAULT_FUTURE_V4_CONFIG))
-    .optional()
-    .default(exports.DEFAULT_FUTURE_V4_CONFIG);
 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
@@ -220,7 +200,6 @@ const VCS_CONFIG_SCHEMA = utils_validation_1.Joi.custom((input) => {
     return value;
 }).default(() => exports.DEFAULT_CONFIG.vcs);
 const FUTURE_CONFIG_SCHEMA = utils_validation_1.Joi.object({
-    v4: FUTURE_V4_SCHEMA,
     faster: utils_validation_1.Joi.any()
         .forbidden()
         .messages({
@@ -375,11 +354,6 @@ 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 webpack config: true => {}, false => undefined (Rspack)
     const webpack = config.webpack;
     if (webpack === true) {

package/package.json

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