Skip to content

Commit c85914c

Browse files
authored
Revert "[dynamicIO] warn for disallowed dynamic in dev" (#71566)
We're going to land this after 15. Reverts #71526
1 parent 0aba53d commit c85914c

37 files changed

+1027
-1432
lines changed

packages/next/src/client/components/client-page.tsx

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,27 @@ export function ClientPageRoot({
4040
)
4141
}
4242

43-
const { createSearchParamsFromClient } =
44-
require('../../server/request/search-params') as typeof import('../../server/request/search-params')
45-
clientSearchParams = createSearchParamsFromClient(searchParams, store)
43+
if (store.isStaticGeneration) {
44+
// We are in a prerender context
45+
const { createPrerenderSearchParamsFromClient } =
46+
require('../../server/request/search-params') as typeof import('../../server/request/search-params')
47+
clientSearchParams = createPrerenderSearchParamsFromClient(store)
4648

47-
const { createParamsFromClient } =
48-
require('../../server/request/params') as typeof import('../../server/request/params')
49-
clientParams = createParamsFromClient(params, store)
49+
const { createPrerenderParamsFromClient } =
50+
require('../../server/request/params') as typeof import('../../server/request/params')
51+
52+
clientParams = createPrerenderParamsFromClient(params, store)
53+
} else {
54+
const { createRenderSearchParamsFromClient } =
55+
require('../../server/request/search-params') as typeof import('../../server/request/search-params')
56+
clientSearchParams = createRenderSearchParamsFromClient(
57+
searchParams,
58+
store
59+
)
60+
const { createRenderParamsFromClient } =
61+
require('../../server/request/params') as typeof import('../../server/request/params')
62+
clientParams = createRenderParamsFromClient(params, store)
63+
}
5064

5165
return <Component params={clientParams} searchParams={clientSearchParams} />
5266
} else {

packages/next/src/client/components/client-segment.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,16 @@ export function ClientSegmentRoot({
3838
)
3939
}
4040

41-
const { createParamsFromClient } =
41+
const { createPrerenderParamsFromClient } =
4242
require('../../server/request/params') as typeof import('../../server/request/params')
43-
clientParams = createParamsFromClient(params, store)
4443

44+
if (store.isStaticGeneration) {
45+
clientParams = createPrerenderParamsFromClient(params, store)
46+
} else {
47+
const { createRenderParamsFromClient } =
48+
require('../../server/request/params') as typeof import('../../server/request/params')
49+
clientParams = createRenderParamsFromClient(params, store)
50+
}
4551
return <Component {...slots} params={clientParams} />
4652
} else {
4753
const { createRenderParamsFromClient } =

0 commit comments

Comments
 (0)