Skip to content

Commit 83d322b

Browse files
ztannerztanner
authored
Revert "auto-enable clientParamParsing and clientSegmentCache w/ cacheCompone…"
This reverts commit efa1ad4.
1 parent 8e93b20 commit 83d322b

File tree

3 files changed

+42
-67
lines changed

3 files changed

+42
-67
lines changed

‎packages/next/src/server/config.ts‎

Lines changed: 21 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,68 +1690,59 @@ function enforceExperimentalFeatures(
16901690
}
16911691
}
16921692

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

17021702
if (configuredExperimentalFeatures) {
17031703
addConfiguredExperimentalFeature(
17041704
configuredExperimentalFeatures,
1705-
'cacheComponents',
1705+
'clientSegmentCache',
17061706
true,
1707-
'enabled by `__NEXT_EXPERIMENTAL_CACHE_COMPONENTS`'
1707+
'enabled by `__NEXT_EXPERIMENTAL_PPR`'
17081708
)
17091709
}
17101710
}
17111711

1712-
const enabledByPprEnv = process.env.__NEXT_EXPERIMENTAL_PPR === 'true'
1713-
const enabledByCacheComponents = config.experimental.cacheComponents === true
1714-
1715-
// TODO: Remove this once we've made Client Segment Cache the default.
1712+
// TODO: Remove this once we've made Client Param Parsing the default.
17161713
if (
1717-
(enabledByPprEnv || enabledByCacheComponents) &&
1714+
process.env.__NEXT_EXPERIMENTAL_PPR === 'true' &&
17181715
// We do respect an explicit value in the user config.
1719-
(config.experimental.clientSegmentCache === undefined ||
1720-
(isDefaultConfig && !config.experimental.clientSegmentCache))
1716+
(config.experimental.clientParamParsing === undefined ||
1717+
(isDefaultConfig && !config.experimental.clientParamParsing))
17211718
) {
1722-
config.experimental.clientSegmentCache = true
1723-
const reason = enabledByCacheComponents
1724-
? 'enabled by `experimental.cacheComponents`'
1725-
: 'enabled by `__NEXT_EXPERIMENTAL_PPR`'
1719+
config.experimental.clientParamParsing = true
17261720

17271721
if (configuredExperimentalFeatures) {
17281722
addConfiguredExperimentalFeature(
17291723
configuredExperimentalFeatures,
1730-
'clientSegmentCache',
1724+
'clientParamParsing',
17311725
true,
1732-
reason
1726+
'enabled by `__NEXT_EXPERIMENTAL_PPR`'
17331727
)
17341728
}
17351729
}
17361730

1737-
// TODO: Remove this once we've made Client Param Parsing the default.
1731+
// TODO: Remove this once we've made Cache Components the default.
17381732
if (
1739-
(enabledByPprEnv || enabledByCacheComponents) &&
1733+
process.env.__NEXT_EXPERIMENTAL_CACHE_COMPONENTS === 'true' &&
17401734
// We do respect an explicit value in the user config.
1741-
(config.experimental.clientParamParsing === undefined ||
1742-
(isDefaultConfig && !config.experimental.clientParamParsing))
1735+
(config.experimental.cacheComponents === undefined ||
1736+
(isDefaultConfig && !config.experimental.cacheComponents))
17431737
) {
1744-
config.experimental.clientParamParsing = true
1745-
const reason = enabledByCacheComponents
1746-
? 'enabled by `experimental.cacheComponents`'
1747-
: 'enabled by `__NEXT_EXPERIMENTAL_PPR`'
1738+
config.experimental.cacheComponents = true
17481739

17491740
if (configuredExperimentalFeatures) {
17501741
addConfiguredExperimentalFeature(
17511742
configuredExperimentalFeatures,
1752-
'clientParamParsing',
1743+
'cacheComponents',
17531744
true,
1754-
reason
1745+
'enabled by `__NEXT_EXPERIMENTAL_CACHE_COMPONENTS`'
17551746
)
17561747
}
17571748
}

‎test/e2e/app-dir/segment-cache/basic/segment-cache-basic.test.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,7 @@ describe('segment cache (basic tests)', () => {
9393
)
9494
})
9595

96-
// TODO(client-param-parsing): With `clientParamParsing` enabled, this test is outdated, because
97-
// we no longer put the param values in the prefetched RSC response. You'd have to opt into runtime
98-
// prefetching for this test to pass until we ship the optimization that would mark this as fully static
99-
// if you don't reference any dynamic params in the server components.
100-
it.skip('navigate to page with lazily-generated (not at build time) static param', async () => {
96+
it('navigate to page with lazily-generated (not at build time) static param', async () => {
10197
let act: ReturnType<typeof createRouterAct>
10298
const browser = await next.browser('/lazily-generated-params', {
10399
beforePageLoad(page) {

‎test/production/app-dir/build-output-prerender/build-output-prerender.test.ts‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ describe('build-output-prerender', () => {
2626
"▲ Next.js x.y.z (Turbopack)
2727
- Experiments (use with caution):
2828
✓ cacheComponents
29-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
30-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
29+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
30+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
3131
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
3232
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
3333
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
@@ -37,8 +37,8 @@ describe('build-output-prerender', () => {
3737
"▲ Next.js x.y.z (webpack)
3838
- Experiments (use with caution):
3939
✓ cacheComponents
40-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
41-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
40+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
41+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
4242
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
4343
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
4444
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
@@ -61,8 +61,8 @@ describe('build-output-prerender', () => {
6161
"▲ Next.js x.y.z (webpack)
6262
- Experiments (use with caution):
6363
✓ cacheComponents
64-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
65-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
64+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
65+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
6666
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
6767
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
6868
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)"
@@ -74,8 +74,6 @@ describe('build-output-prerender', () => {
7474
"▲ Next.js x.y.z (Turbopack)
7575
- Experiments (use with caution):
7676
✓ cacheComponents
77-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
78-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
7977
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
8078
✓ ppr (enabled by \`experimental.cacheComponents\`)
8179
✓ rdcForNavigations (enabled by \`experimental.ppr\`)"
@@ -85,8 +83,6 @@ describe('build-output-prerender', () => {
8583
"▲ Next.js x.y.z (Rspack)
8684
- Experiments (use with caution):
8785
✓ cacheComponents
88-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
89-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
9086
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
9187
✓ ppr (enabled by \`experimental.cacheComponents\`)
9288
✓ rdcForNavigations (enabled by \`experimental.ppr\`)"
@@ -96,8 +92,6 @@ describe('build-output-prerender', () => {
9692
"▲ Next.js x.y.z (webpack)
9793
- Experiments (use with caution):
9894
✓ cacheComponents
99-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
100-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
10195
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
10296
✓ ppr (enabled by \`experimental.cacheComponents\`)
10397
✓ rdcForNavigations (enabled by \`experimental.ppr\`)"
@@ -155,8 +149,8 @@ describe('build-output-prerender', () => {
155149
▲ Next.js x.y.z (Turbopack)
156150
- Experiments (use with caution):
157151
✓ cacheComponents
158-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
159-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
152+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
153+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
160154
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
161155
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
162156
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -170,8 +164,8 @@ describe('build-output-prerender', () => {
170164
▲ Next.js x.y.z (webpack)
171165
- Experiments (use with caution):
172166
✓ cacheComponents
173-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
174-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
167+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
168+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
175169
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
176170
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
177171
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -202,8 +196,8 @@ describe('build-output-prerender', () => {
202196
▲ Next.js x.y.z (webpack)
203197
- Experiments (use with caution):
204198
✓ cacheComponents
205-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
206-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
199+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
200+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
207201
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
208202
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
209203
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -219,8 +213,6 @@ describe('build-output-prerender', () => {
219213
▲ Next.js x.y.z (Turbopack)
220214
- Experiments (use with caution):
221215
✓ cacheComponents
222-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
223-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
224216
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
225217
✓ ppr (enabled by \`experimental.cacheComponents\`)
226218
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -234,8 +226,6 @@ describe('build-output-prerender', () => {
234226
▲ Next.js x.y.z (Rspack)
235227
- Experiments (use with caution):
236228
✓ cacheComponents
237-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
238-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
239229
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
240230
✓ ppr (enabled by \`experimental.cacheComponents\`)
241231
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -249,8 +239,6 @@ describe('build-output-prerender', () => {
249239
▲ Next.js x.y.z (webpack)
250240
- Experiments (use with caution):
251241
✓ cacheComponents
252-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
253-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
254242
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
255243
✓ ppr (enabled by \`experimental.cacheComponents\`)
256244
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -309,8 +297,8 @@ describe('build-output-prerender', () => {
309297
"▲ Next.js x.y.z (Turbopack)
310298
- Experiments (use with caution):
311299
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
312-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
313-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
300+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
301+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
314302
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
315303
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
316304
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
@@ -320,8 +308,8 @@ describe('build-output-prerender', () => {
320308
"▲ Next.js x.y.z (webpack)
321309
- Experiments (use with caution):
322310
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
323-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
324-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
311+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
312+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
325313
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)
326314
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
327315
✓ rdcForNavigations (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)"
@@ -382,8 +370,8 @@ describe('build-output-prerender', () => {
382370
▲ Next.js x.y.z (Turbopack)
383371
- Experiments (use with caution):
384372
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
385-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
386-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
373+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
374+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
387375
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
388376
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
389377
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
@@ -397,8 +385,8 @@ describe('build-output-prerender', () => {
397385
▲ Next.js x.y.z (webpack)
398386
- Experiments (use with caution):
399387
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
400-
✓ clientParamParsing (enabled by \`experimental.cacheComponents\`)
401-
✓ clientSegmentCache (enabled by \`experimental.cacheComponents\`)
388+
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
389+
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
402390
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)
403391
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
404392
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)

0 commit comments

Comments
 (0)