run all dynamic validation through prerenders

Author: gnoff

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

@@ -40,27 +40,13 @@ export function ClientPageRoot({
       )
     }
 
-    if (store.isStaticGeneration) {
-      // We are in a prerender context
-      const { createPrerenderSearchParamsFromClient } =
-        require('../../server/request/search-params') as typeof import('../../server/request/search-params')
-      clientSearchParams = createPrerenderSearchParamsFromClient(store)
+    const { createSearchParamsFromClient } =
+      require('../../server/request/search-params') as typeof import('../../server/request/search-params')
+    clientSearchParams = createSearchParamsFromClient(searchParams, store)
 
-      const { createPrerenderParamsFromClient } =
-        require('../../server/request/params') as typeof import('../../server/request/params')
-
-      clientParams = createPrerenderParamsFromClient(params, store)
-    } else {
-      const { createRenderSearchParamsFromClient } =
-        require('../../server/request/search-params') as typeof import('../../server/request/search-params')
-      clientSearchParams = createRenderSearchParamsFromClient(
-        searchParams,
-        store
-      )
-      const { createRenderParamsFromClient } =
-        require('../../server/request/params') as typeof import('../../server/request/params')
-      clientParams = createRenderParamsFromClient(params, store)
-    }
+    const { createParamsFromClient } =
+      require('../../server/request/params') as typeof import('../../server/request/params')
+    clientParams = createParamsFromClient(params, store)
 
     return <Component params={clientParams} searchParams={clientSearchParams} />
   } else {

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

@@ -38,16 +38,10 @@ export function ClientSegmentRoot({
       )
     }
 
-    const { createPrerenderParamsFromClient } =
+    const { createParamsFromClient } =
       require('../../server/request/params') as typeof import('../../server/request/params')
+    clientParams = createParamsFromClient(params, store)
 
-    if (store.isStaticGeneration) {
-      clientParams = createPrerenderParamsFromClient(params, store)
-    } else {
-      const { createRenderParamsFromClient } =
-        require('../../server/request/params') as typeof import('../../server/request/params')
-      clientParams = createRenderParamsFromClient(params, store)
-    }
     return <Component {...slots} params={clientParams} />
   } else {
     const { createRenderParamsFromClient } =