Revert "[dynamicIO] warn for disallowed dynamic in dev" (#71566)

We're going to land this after 15. Reverts #71526
vercel · Oct 21, 2024 · c85914c · c85914c
1 parent 0aba53d
commit c85914c
Show file tree

Hide file tree

Showing 37 changed files with 1,027 additions and 1,432 deletions.
diff --git a/packages/next/src/client/components/client-page.tsx b/packages/next/src/client/components/client-page.tsx
@@ -40,13 +40,27 @@ export function ClientPageRoot({
       )
     }
 
-    const { createSearchParamsFromClient } =
-      require('../../server/request/search-params') as typeof import('../../server/request/search-params')
-    clientSearchParams = createSearchParamsFromClient(searchParams, store)
+    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 { createParamsFromClient } =
-      require('../../server/request/params') as typeof import('../../server/request/params')
-    clientParams = createParamsFromClient(params, 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)
+    }
 
     return <Component params={clientParams} searchParams={clientSearchParams} />
   } else {

diff --git a/packages/next/src/client/components/client-segment.tsx b/packages/next/src/client/components/client-segment.tsx
@@ -38,10 +38,16 @@ export function ClientSegmentRoot({
       )
     }
 
-    const { createParamsFromClient } =
+    const { createPrerenderParamsFromClient } =
       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 } =