skip PPR

vercel · Jul 31, 2024 · d2fcdeb · d2fcdeb
1 parent 4b3f866
commit d2fcdeb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts b/packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts
@@ -30,7 +30,8 @@ function createPrefetchCacheKey(
   // In the auto case, since loading.js & layout.js won't have access to search params,
   // we can safely re-use that cache entry. But for full prefetches, we should not
   // re-use the cache entry as the response may differ.
-  if (prefetchKind === PrefetchKind.FULL) {
+  // TODO: Investigate how this should work with PPR. For now, PPR always keys on the full URL.
+  if (prefetchKind === PrefetchKind.FULL || process.env.__NEXT_PPR) {
     // if we have a full prefetch, we can include the search param in the key,
     // as we'll be getting back a full response. The server might have read the search
     // params when generating the full response.

diff --git a/test/e2e/app-dir/navigation/navigation.test.ts b/test/e2e/app-dir/navigation/navigation.test.ts
@@ -3,7 +3,7 @@ import { retry, waitFor } from 'next-test-utils'
 import type { Response } from 'playwright'
 
 describe('app dir - navigation', () => {
-  const { next, isNextDev, isNextStart, isNextDeploy } = nextTestSetup({
+  const { next, isNextDev, isNextDeploy } = nextTestSetup({
     files: __dirname,
   })
 
@@ -176,16 +176,6 @@ describe('app dir - navigation', () => {
         )
       }
 
-      if (isNextStart || isNextDeploy) {
-        await browser.waitForIdleNetwork()
-        // there should be an RSC call for the prefetch
-        expect(hasRscRequest).toBe(true)
-      }
-
-      // Wait for all network requests to finish, and then initialize the flag
-      // used to determine if any RSC requests are made
-      hasRscRequest = false
-
       await checkLink(6, 128)
       await checkLink(50, 744)
       await checkLink(160, 2284)

diff --git a/test/ppr-tests-manifest.json b/test/ppr-tests-manifest.json
@@ -82,7 +82,8 @@
       "test/e2e/app-dir/searchparams-static-bailout/searchparams-static-bailout.test.ts",
       "test/e2e/app-dir/app-client-cache/client-cache.experimental.test.ts",
       "test/e2e/app-dir/app-client-cache/client-cache.original.test.ts",
-      "test/e2e/app-dir/app-client-cache/client-cache.defaults.test.ts"
+      "test/e2e/app-dir/app-client-cache/client-cache.defaults.test.ts",
+      "test/e2e/app-dir/searchparams-reuse-loading/searchparams-reuse-loading.test.ts"
     ]
   }
 }