Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 21 additions & 30 deletions packages/next/src/server/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1690,68 +1690,59 @@ function enforceExperimentalFeatures(
}
}

// TODO: Remove this once we've made Cache Components the default.
// TODO: Remove this once we've made Client Segment Cache the default.
if (
process.env.__NEXT_EXPERIMENTAL_CACHE_COMPONENTS === 'true' &&
process.env.__NEXT_EXPERIMENTAL_PPR === 'true' &&
// We do respect an explicit value in the user config.
(config.experimental.cacheComponents === undefined ||
(isDefaultConfig && !config.experimental.cacheComponents))
(config.experimental.clientSegmentCache === undefined ||
(isDefaultConfig && !config.experimental.clientSegmentCache))
) {
config.experimental.cacheComponents = true
config.experimental.clientSegmentCache = true

if (configuredExperimentalFeatures) {
addConfiguredExperimentalFeature(
configuredExperimentalFeatures,
'cacheComponents',
'clientSegmentCache',
true,
'enabled by `__NEXT_EXPERIMENTAL_CACHE_COMPONENTS`'
'enabled by `__NEXT_EXPERIMENTAL_PPR`'
)
}
}

const enabledByPprEnv = process.env.__NEXT_EXPERIMENTAL_PPR === 'true'
const enabledByCacheComponents = config.experimental.cacheComponents === true

// TODO: Remove this once we've made Client Segment Cache the default.
// TODO: Remove this once we've made Client Param Parsing the default.
if (
(enabledByPprEnv || enabledByCacheComponents) &&
process.env.__NEXT_EXPERIMENTAL_PPR === 'true' &&
// We do respect an explicit value in the user config.
(config.experimental.clientSegmentCache === undefined ||
(isDefaultConfig && !config.experimental.clientSegmentCache))
(config.experimental.clientParamParsing === undefined ||
(isDefaultConfig && !config.experimental.clientParamParsing))
) {
config.experimental.clientSegmentCache = true
const reason = enabledByCacheComponents
? 'enabled by `experimental.cacheComponents`'
: 'enabled by `__NEXT_EXPERIMENTAL_PPR`'
config.experimental.clientParamParsing = true

if (configuredExperimentalFeatures) {
addConfiguredExperimentalFeature(
configuredExperimentalFeatures,
'clientSegmentCache',
'clientParamParsing',
true,
reason
'enabled by `__NEXT_EXPERIMENTAL_PPR`'
)
}
}

// TODO: Remove this once we've made Client Param Parsing the default.
// TODO: Remove this once we've made Cache Components the default.
if (
(enabledByPprEnv || enabledByCacheComponents) &&
process.env.__NEXT_EXPERIMENTAL_CACHE_COMPONENTS === 'true' &&
// We do respect an explicit value in the user config.
(config.experimental.clientParamParsing === undefined ||
(isDefaultConfig && !config.experimental.clientParamParsing))
(config.experimental.cacheComponents === undefined ||
(isDefaultConfig && !config.experimental.cacheComponents))
) {
config.experimental.clientParamParsing = true
const reason = enabledByCacheComponents
? 'enabled by `experimental.cacheComponents`'
: 'enabled by `__NEXT_EXPERIMENTAL_PPR`'
config.experimental.cacheComponents = true

if (configuredExperimentalFeatures) {
addConfiguredExperimentalFeature(
configuredExperimentalFeatures,
'clientParamParsing',
'cacheComponents',
true,
reason
'enabled by `__NEXT_EXPERIMENTAL_CACHE_COMPONENTS`'
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,7 @@ describe('segment cache (basic tests)', () => {
)
})

// TODO(client-param-parsing): With `clientParamParsing` enabled, this test is outdated, because
// we no longer put the param values in the prefetched RSC response. You'd have to opt into runtime
// prefetching for this test to pass until we ship the optimization that would mark this as fully static
// if you don't reference any dynamic params in the server components.
it.skip('navigate to page with lazily-generated (not at build time) static param', async () => {
it('navigate to page with lazily-generated (not at build time) static param', async () => {
let act: ReturnType<typeof createRouterAct>
const browser = await next.browser('/lazily-generated-params', {
beforePageLoad(page) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
Expand All @@ -37,8 +37,8 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
Expand All @@ -61,8 +61,8 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)"
Expand All @@ -74,8 +74,6 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`experimental.cacheComponents\`)
✓ rdcForNavigations (enabled by \`experimental.ppr\`)"
Expand All @@ -85,8 +83,6 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (Rspack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`experimental.cacheComponents\`)
✓ rdcForNavigations (enabled by \`experimental.ppr\`)"
Expand All @@ -96,8 +92,6 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`experimental.cacheComponents\`)
✓ rdcForNavigations (enabled by \`experimental.ppr\`)"
Expand Down Expand Up @@ -155,8 +149,8 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand All @@ -170,8 +164,8 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand Down Expand Up @@ -202,8 +196,8 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand All @@ -219,8 +213,6 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`experimental.cacheComponents\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand All @@ -234,8 +226,6 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (Rspack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`experimental.cacheComponents\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand All @@ -249,8 +239,6 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`experimental.cacheComponents\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand Down Expand Up @@ -309,8 +297,8 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution):
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
Expand All @@ -320,8 +308,8 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
Expand Down Expand Up @@ -382,8 +370,8 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution):
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand All @@ -397,8 +385,8 @@ describe('build-output-prerender', () => {
▲ Next.js x.y.z (webpack)
- Experiments (use with caution):
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
Expand Down
Loading