Unverified Commit 5ae7baa0 authored by Andrew Clark's avatar Andrew Clark Committed by GitHub

Add experimental clientParamParsing feature flag (#82393)

This will be used to roll out an internal implementation change; it
won't ever be a user-facing configuration. The plan is to remove it as
soon as the feature is properly tested.
parent 62bc131f
...@@ -199,6 +199,9 @@ export function getDefineEnv({ ...@@ -199,6 +199,9 @@ export function getDefineEnv({
'process.env.__NEXT_CLIENT_SEGMENT_CACHE': Boolean( 'process.env.__NEXT_CLIENT_SEGMENT_CACHE': Boolean(
config.experimental.clientSegmentCache config.experimental.clientSegmentCache
), ),
'process.env.__NEXT_CLIENT_PARAM_PARSING': Boolean(
config.experimental.clientParamParsing
),
'process.env.__NEXT_CLIENT_VALIDATE_RSC_REQUEST_HEADERS': Boolean( 'process.env.__NEXT_CLIENT_VALIDATE_RSC_REQUEST_HEADERS': Boolean(
config.experimental.validateRSCRequestHeaders config.experimental.validateRSCRequestHeaders
), ),
......
...@@ -533,6 +533,9 @@ export async function handler( ...@@ -533,6 +533,9 @@ export async function handler(
clientSegmentCache: Boolean( clientSegmentCache: Boolean(
nextConfig.experimental.clientSegmentCache nextConfig.experimental.clientSegmentCache
), ),
clientParamParsing: Boolean(
nextConfig.experimental.clientParamParsing
),
dynamicOnHover: Boolean(nextConfig.experimental.dynamicOnHover), dynamicOnHover: Boolean(nextConfig.experimental.dynamicOnHover),
inlineCss: Boolean(nextConfig.experimental.inlineCss), inlineCss: Boolean(nextConfig.experimental.inlineCss),
authInterrupts: Boolean(nextConfig.experimental.authInterrupts), authInterrupts: Boolean(nextConfig.experimental.authInterrupts),
......
...@@ -163,6 +163,7 @@ async function requestHandler( ...@@ -163,6 +163,7 @@ async function requestHandler(
staleTimes: nextConfig.experimental.staleTimes, staleTimes: nextConfig.experimental.staleTimes,
cacheComponents: Boolean(nextConfig.experimental.cacheComponents), cacheComponents: Boolean(nextConfig.experimental.cacheComponents),
clientSegmentCache: Boolean(nextConfig.experimental.clientSegmentCache), clientSegmentCache: Boolean(nextConfig.experimental.clientSegmentCache),
clientParamParsing: Boolean(nextConfig.experimental.clientParamParsing),
dynamicOnHover: Boolean(nextConfig.experimental.dynamicOnHover), dynamicOnHover: Boolean(nextConfig.experimental.dynamicOnHover),
inlineCss: Boolean(nextConfig.experimental.inlineCss), inlineCss: Boolean(nextConfig.experimental.inlineCss),
authInterrupts: Boolean(nextConfig.experimental.authInterrupts), authInterrupts: Boolean(nextConfig.experimental.authInterrupts),
......
...@@ -404,6 +404,7 @@ async function exportAppImpl( ...@@ -404,6 +404,7 @@ async function exportAppImpl(
nextConfig.experimental.clientSegmentCache === 'client-only' nextConfig.experimental.clientSegmentCache === 'client-only'
? 'client-only' ? 'client-only'
: Boolean(nextConfig.experimental.clientSegmentCache), : Boolean(nextConfig.experimental.clientSegmentCache),
clientParamParsing: nextConfig.experimental.clientParamParsing ?? false,
dynamicOnHover: nextConfig.experimental.dynamicOnHover ?? false, dynamicOnHover: nextConfig.experimental.dynamicOnHover ?? false,
inlineCss: nextConfig.experimental.inlineCss ?? false, inlineCss: nextConfig.experimental.inlineCss ?? false,
authInterrupts: !!nextConfig.experimental.authInterrupts, authInterrupts: !!nextConfig.experimental.authInterrupts,
......
...@@ -261,6 +261,7 @@ export interface RenderOptsPartial { ...@@ -261,6 +261,7 @@ export interface RenderOptsPartial {
clientTraceMetadata: string[] | undefined clientTraceMetadata: string[] | undefined
cacheComponents: boolean cacheComponents: boolean
clientSegmentCache: boolean | 'client-only' clientSegmentCache: boolean | 'client-only'
clientParamParsing: boolean
dynamicOnHover: boolean dynamicOnHover: boolean
inlineCss: boolean inlineCss: boolean
authInterrupts: boolean authInterrupts: boolean
......
...@@ -568,6 +568,8 @@ export default abstract class Server< ...@@ -568,6 +568,8 @@ export default abstract class Server<
this.nextConfig.experimental.clientSegmentCache === 'client-only' this.nextConfig.experimental.clientSegmentCache === 'client-only'
? 'client-only' ? 'client-only'
: Boolean(this.nextConfig.experimental.clientSegmentCache), : Boolean(this.nextConfig.experimental.clientSegmentCache),
clientParamParsing:
this.nextConfig.experimental.clientParamParsing ?? false,
dynamicOnHover: this.nextConfig.experimental.dynamicOnHover ?? false, dynamicOnHover: this.nextConfig.experimental.dynamicOnHover ?? false,
inlineCss: this.nextConfig.experimental.inlineCss ?? false, inlineCss: this.nextConfig.experimental.inlineCss ?? false,
authInterrupts: !!this.nextConfig.experimental.authInterrupts, authInterrupts: !!this.nextConfig.experimental.authInterrupts,
......
...@@ -358,6 +358,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() => ...@@ -358,6 +358,7 @@ export const configSchema: zod.ZodType<NextConfig> = z.lazy(() =>
clientSegmentCache: z clientSegmentCache: z
.union([z.boolean(), z.literal('client-only')]) .union([z.boolean(), z.literal('client-only')])
.optional(), .optional(),
clientParamParsing: z.boolean().optional(),
dynamicOnHover: z.boolean().optional(), dynamicOnHover: z.boolean().optional(),
disableOptimizedLoading: z.boolean().optional(), disableOptimizedLoading: z.boolean().optional(),
disablePostcssPresetEnv: z.boolean().optional(), disablePostcssPresetEnv: z.boolean().optional(),
......
...@@ -331,6 +331,7 @@ export interface ExperimentalConfig { ...@@ -331,6 +331,7 @@ export interface ExperimentalConfig {
linkNoTouchStart?: boolean linkNoTouchStart?: boolean
caseSensitiveRoutes?: boolean caseSensitiveRoutes?: boolean
clientSegmentCache?: boolean | 'client-only' clientSegmentCache?: boolean | 'client-only'
clientParamParsing?: boolean
dynamicOnHover?: boolean dynamicOnHover?: boolean
appDocumentPreloading?: boolean appDocumentPreloading?: boolean
preloadEntriesOnStart?: boolean preloadEntriesOnStart?: boolean
...@@ -1400,6 +1401,7 @@ export const defaultConfig = Object.freeze({ ...@@ -1400,6 +1401,7 @@ export const defaultConfig = Object.freeze({
linkNoTouchStart: false, linkNoTouchStart: false,
caseSensitiveRoutes: false, caseSensitiveRoutes: false,
clientSegmentCache: false, clientSegmentCache: false,
clientParamParsing: false,
dynamicOnHover: false, dynamicOnHover: false,
appDocumentPreloading: undefined, appDocumentPreloading: undefined,
preloadEntriesOnStart: true, preloadEntriesOnStart: true,
......
...@@ -1715,6 +1715,25 @@ function enforceExperimentalFeatures( ...@@ -1715,6 +1715,25 @@ function enforceExperimentalFeatures(
} }
} }
// TODO: Remove this once we've made Client Param Parsing the default.
if (
process.env.__NEXT_EXPERIMENTAL_PPR === 'true' &&
// We do respect an explicit value in the user config.
(config.experimental.clientParamParsing === undefined ||
(isDefaultConfig && !config.experimental.clientParamParsing))
) {
config.experimental.clientParamParsing = true
if (configuredExperimentalFeatures) {
addConfiguredExperimentalFeature(
configuredExperimentalFeatures,
'clientParamParsing',
true,
'enabled by `__NEXT_EXPERIMENTAL_PPR`'
)
}
}
// TODO: Remove this once we've made Cache Components the default. // TODO: Remove this once we've made Cache Components the default.
if ( if (
process.env.__NEXT_EXPERIMENTAL_CACHE_COMPONENTS === 'true' && process.env.__NEXT_EXPERIMENTAL_CACHE_COMPONENTS === 'true' &&
......
...@@ -26,6 +26,7 @@ describe('build-output-prerender', () => { ...@@ -26,6 +26,7 @@ describe('build-output-prerender', () => {
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ cacheComponents ✓ cacheComponents
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)" ✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)"
`) `)
} else { } else {
...@@ -35,6 +36,7 @@ describe('build-output-prerender', () => { ...@@ -35,6 +36,7 @@ describe('build-output-prerender', () => {
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ cacheComponents ✓ cacheComponents
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)" ✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)"
`) `)
} }
...@@ -46,6 +48,7 @@ describe('build-output-prerender', () => { ...@@ -46,6 +48,7 @@ describe('build-output-prerender', () => {
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ cacheComponents ✓ cacheComponents
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)" ✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)"
`) `)
} else { } else {
...@@ -55,6 +58,7 @@ describe('build-output-prerender', () => { ...@@ -55,6 +58,7 @@ describe('build-output-prerender', () => {
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ cacheComponents ✓ cacheComponents
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)" ✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)"
`) `)
} }
...@@ -131,6 +135,7 @@ describe('build-output-prerender', () => { ...@@ -131,6 +135,7 @@ describe('build-output-prerender', () => {
✓ serverSourceMaps (enabled by \`--debug-prerender\`) ✓ serverSourceMaps (enabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} else { } else {
...@@ -144,6 +149,7 @@ describe('build-output-prerender', () => { ...@@ -144,6 +149,7 @@ describe('build-output-prerender', () => {
⨯ serverMinification (disabled by \`--debug-prerender\`) ⨯ serverMinification (disabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} }
...@@ -159,6 +165,7 @@ describe('build-output-prerender', () => { ...@@ -159,6 +165,7 @@ describe('build-output-prerender', () => {
✓ serverSourceMaps (enabled by \`--debug-prerender\`) ✓ serverSourceMaps (enabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} else { } else {
...@@ -172,6 +179,7 @@ describe('build-output-prerender', () => { ...@@ -172,6 +179,7 @@ describe('build-output-prerender', () => {
⨯ serverMinification (disabled by \`--debug-prerender\`) ⨯ serverMinification (disabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} }
...@@ -251,6 +259,7 @@ describe('build-output-prerender', () => { ...@@ -251,6 +259,7 @@ describe('build-output-prerender', () => {
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`) ✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)" ✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)"
`) `)
} else { } else {
...@@ -260,6 +269,7 @@ describe('build-output-prerender', () => { ...@@ -260,6 +269,7 @@ describe('build-output-prerender', () => {
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`) ✓ cacheComponents (enabled by \`__NEXT_EXPERIMENTAL_CACHE_COMPONENTS\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)" ✓ enablePrerenderSourceMaps (enabled by \`experimental.cacheComponents\`)"
`) `)
} }
...@@ -269,14 +279,16 @@ describe('build-output-prerender', () => { ...@@ -269,14 +279,16 @@ describe('build-output-prerender', () => {
"▲ Next.js x.y.z (Turbopack) "▲ Next.js x.y.z (Turbopack)
- Experiments (use with caution): - Experiments (use with caution):
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)" ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)"
`) `)
} else { } else {
expect(getPreambleOutput(next.cliOutput)).toMatchInlineSnapshot(` expect(getPreambleOutput(next.cliOutput)).toMatchInlineSnapshot(`
"▲ Next.js x.y.z "▲ Next.js x.y.z
- Experiments (use with caution): - Experiments (use with caution):
✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ ppr (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)" ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)"
`) `)
} }
} else { } else {
...@@ -315,6 +327,7 @@ describe('build-output-prerender', () => { ...@@ -315,6 +327,7 @@ describe('build-output-prerender', () => {
✓ serverSourceMaps (enabled by \`--debug-prerender\`) ✓ serverSourceMaps (enabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} else { } else {
...@@ -328,6 +341,7 @@ describe('build-output-prerender', () => { ...@@ -328,6 +341,7 @@ describe('build-output-prerender', () => {
⨯ serverMinification (disabled by \`--debug-prerender\`) ⨯ serverMinification (disabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} }
...@@ -342,6 +356,7 @@ describe('build-output-prerender', () => { ...@@ -342,6 +356,7 @@ describe('build-output-prerender', () => {
✓ serverSourceMaps (enabled by \`--debug-prerender\`) ✓ serverSourceMaps (enabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} else { } else {
...@@ -354,6 +369,7 @@ describe('build-output-prerender', () => { ...@@ -354,6 +369,7 @@ describe('build-output-prerender', () => {
⨯ serverMinification (disabled by \`--debug-prerender\`) ⨯ serverMinification (disabled by \`--debug-prerender\`)
⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`) ⨯ prerenderEarlyExit (disabled by \`--debug-prerender\`)
✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`) ✓ clientSegmentCache (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ clientParamParsing (enabled by \`__NEXT_EXPERIMENTAL_PPR\`)
✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)" ✓ enablePrerenderSourceMaps (enabled by \`--debug-prerender\`)"
`) `)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment