next 16.0.0-canary.5 → 16.0.0-canary.6

package/dist/esm/server/config.js

@@ -139,8 +139,8 @@ function warnCustomizedOption(config, key, defaultValue, customMessage, configFi
  * @param userConfig - The user config.
  * @param silent - Whether to suppress warnings.
  * @returns The complete config.
- */ function assignDefaultsAndValidate(dir, userConfig, silent, configuredExperimentalFeatures, phase) {
-    var _result_experimental, _result_experimental1, _result_experimental_serverActions, _result_experimental2, _userConfig_experimental, _userConfig_experimental1, _userConfig_experimental2, _userConfig_experimental3, _userConfig_experimental4, _userConfig_experimental5, _userConfig_experimental6, _userConfig_experimental7, _userConfig_experimental8, _userConfig_experimental9, _userConfig_experimental10, _userConfig_experimental11, _result_experimental3, _result_turbopack, _result_turbopack1, _result_devIndicators, _result_experimental4, _result_experimental5, _userConfig_experimental12, _result_experimental6;
+ */ function assignDefaultsAndValidate(dir, userConfig, silent, phase) {
+    var _result_experimental, _result_experimental1, _result_experimental_serverActions, _result_experimental2, _userConfig_experimental, _userConfig_experimental1, _userConfig_experimental2, _userConfig_experimental3, _userConfig_experimental4, _userConfig_experimental5, _userConfig_experimental6, _userConfig_experimental7, _userConfig_experimental8, _userConfig_experimental9, _userConfig_experimental10, _userConfig_experimental11, _result_experimental3, _result_turbopack, _result_turbopack1, _result_devIndicators, _result_experimental4, _result_experimental5, _result_experimental6;
     const configFileName = userConfig.configFileName;
     if (typeof userConfig.exportTrailingSlash !== 'undefined') {
         if (!silent) {
@@ -936,22 +936,6 @@ function warnCustomizedOption(config, key, defaultValue, customMessage, configFi
     if (result.experimental.useCache === undefined) {
         result.experimental.useCache = result.experimental.cacheComponents;
     }
-    // If cacheComponents is enabled and the user hasn't configured
-    // rdcForNavigations, we enable it by default.
-    if (result.experimental.cacheComponents && ((_userConfig_experimental12 = userConfig.experimental) == null ? void 0 : _userConfig_experimental12.rdcForNavigations) === undefined) {
-        result.experimental.rdcForNavigations = true;
-        if (configuredExperimentalFeatures) {
-            addConfiguredExperimentalFeature(configuredExperimentalFeatures, 'rdcForNavigations', true, 'enabled by `experimental.cacheComponents`');
-        }
-    }
-    // If rdcForNavigations is enabled, but cacheComponents is not, we throw an error.
-    if (result.experimental.rdcForNavigations && !result.experimental.cacheComponents) {
-        throw Object.defineProperty(new Error('`experimental.rdcForNavigations` is enabled, but `experimental.cacheComponents` is not.'), "__NEXT_ERROR_CODE", {
-            value: "E865",
-            enumerable: false,
-            configurable: true
-        });
-    }
     if (phase === PHASE_DEVELOPMENT_SERVER && ((_result_experimental6 = result.experimental) == null ? void 0 : _result_experimental6.isolatedDevBuild)) {
         result.distDir = join(result.distDir, 'dev');
     }
@@ -1051,7 +1035,7 @@ export default async function loadConfig(phase, dir, { customConfig, rawConfig,
             configOrigin: 'server',
             configFileName,
             ...customConfig
-        }, silent, configuredExperimentalFeatures, phase), phase, silent);
+        }, silent, phase), phase, silent);
         // Cache the custom config result
         configCache.set(cacheKey, {
             config,
@@ -1175,7 +1159,7 @@ export default async function loadConfig(phase, dir, { customConfig, rawConfig,
             configFile: path,
             configFileName,
             ...userConfig
-        }, silent, configuredExperimentalFeatures, phase);
+        }, silent, phase);
         const finalConfig = await applyModifyConfig(completeConfig, phase, silent);
         // Cache the final result
         configCache.set(cacheKey, {
@@ -1222,7 +1206,7 @@ export default async function loadConfig(phase, dir, { customConfig, rawConfig,
     const completeConfig = assignDefaultsAndValidate(dir, {
         ...clonedDefaultConfig,
         configFileName
-    }, silent, configuredExperimentalFeatures, phase);
+    }, silent, phase);
     setHttpClientAndAgentOptions(completeConfig);
     const finalConfig = await applyModifyConfig(completeConfig, phase, silent);
     // Cache the default config result
@@ -1253,14 +1237,6 @@ function enforceExperimentalFeatures(config, options) {
             addConfiguredExperimentalFeature(configuredExperimentalFeatures, 'cacheComponents', true, 'enabled by `__NEXT_EXPERIMENTAL_CACHE_COMPONENTS`');
         }
     }
-    // TODO: Remove this once we've made RDC for Navigations the default for cache components.
-    if (process.env.__NEXT_EXPERIMENTAL_CACHE_COMPONENTS === 'true' && // We do respect an explicit value in the user config.
-    (config.experimental.rdcForNavigations === undefined || isDefaultConfig && !config.experimental.rdcForNavigations)) {
-        config.experimental.rdcForNavigations = true;
-        if (configuredExperimentalFeatures) {
-            addConfiguredExperimentalFeature(configuredExperimentalFeatures, 'rdcForNavigations', true, 'enabled by `__NEXT_EXPERIMENTAL_CACHE_COMPONENTS`');
-        }
-    }
     // TODO: Remove this once using the debug channel is the default.
     if (process.env.__NEXT_EXPERIMENTAL_DEBUG_CHANNEL === 'true' && // We do respect an explicit value in the user config.
     (config.experimental.reactDebugChannel === undefined || isDefaultConfig && !config.experimental.reactDebugChannel)) {