Add PPR support and improve caching mechanisms by conico974 · Pull Request #24 · opennextjs/adapters-api

conico974 · 2026-02-15T11:28:37Z

Add PPR support in both cloudflare and aws.
Left to do :

Fix use cache in cloudflare
~~Figure out why use cache doesn't work in ISR~~ Let's do that in a follow up PR
Re enable experimental test in cloudflare

pkg-pr-new · 2026-02-15T11:29:25Z

npm i https://pkg.pr.new/@opennextjs/cloudflare@24

npm i https://pkg.pr.new/@opennextjs/aws@24

commit: f1e93f4

…eader

Copilot

Pull request overview

Adds Partial Prerendering (PPR) plumbing to OpenNext’s cache interception flow and updates Cloudflare/AWS adapters to support newer Next.js caching APIs, along with test and example updates to validate the behavior.

Changes:

Introduces PartialResult / initialResponse to support PPR prelude + resume-request handling across routing/request handling.
Extends cache serialization/deserialization for App Router cached entries with postponed + segmentData.
Updates Next.js versions and adjusts e2e/unit tests and example apps to exercise PPR and composable cache behavior.

Reviewed changes

Copilot reviewed 36 out of 37 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
pnpm-workspace.yaml	Bumps catalog Next.js versions (aws/e2e) to 16.2.1.
pnpm-lock.yaml	Lockfile updates for Next.js + transitive deps.
packages/tests-unit/tests/adapters/cache.test.ts	Adds unit coverage for APP_PAGE `segmentData` + `postponed`.
packages/tests-e2e/tests/experimental/use-cache.test.ts	Skips ISR case pending investigation.
packages/tests-e2e/tests/experimental/ppr.test.ts	Updates PPR expectations (postponed/prerender/cache headers).
packages/tests-e2e/tests/appRouter/revalidateTag.test.ts	Updates expected `x-nextjs-cache` behavior.
packages/tests-e2e/tests/appRouter/og.test.ts	Skips OG tests pending fixes.
packages/tests-e2e/playwright.config.js	Re-enables the experimental e2e project.
packages/open-next/src/types/open-next.ts	Adds `PartialResult` and `RoutingResult.initialResponse`.
packages/open-next/src/types/cache.ts	Adds `segmentData` to APP_PAGE cache value type.
packages/open-next/src/overrides/converters/edge.ts	Allows returning `{ initialResponse, request }` in dangerous mode for PPR.
packages/open-next/src/core/routingHandler.ts	Handles `PartialResult` from cache interception and surfaces `initialResponse`.
packages/open-next/src/core/routing/cacheInterceptor.ts	Implements PPR cache interception/resume-request behavior and segment prefetch handling.
packages/open-next/src/core/requestHandler.ts	Streams `initialResponse` then resumes via POST (`next-resume`) in Node handler.
packages/open-next/src/adapters/middleware.ts	Propagates `initialResponse` through middleware adapter result.
packages/open-next/src/adapters/cache.ts	Writes `postponed` + `segmentData` into incremental cache storage.
packages/open-next/src/adapter.ts	Sets top-level `cacheHandlers` (default/remote) for composable cache.
packages/cloudflare/src/cli/templates/worker.ts	Adds Cloudflare worker handling for PPR prelude + resume streaming.
packages/cloudflare/src/cli/build/patches/plugins/route-module.ts	Patches Next route-module to require composable cache handler module.
packages/cloudflare/src/cli/build/patches/plugins/route-module.spec.ts	Notes missing test coverage for the new composable cache patch.
packages/cloudflare/src/cli/build/patches/plugins/load-manifest.ts	Treats certain manifests as optional to avoid worker crashes.
packages/cloudflare/src/cli/adapter.ts	Sets top-level `cacheHandlers` (default/remote) for composable cache.
examples/experimental/tsconfig.json	Switches JSX mode and includes additional `.next` dev types.
examples/experimental/src/proxy.ts	Renames default export and removes explicit runtime config.
examples/experimental/src/components/cached.tsx	Updates to `cacheLife/cacheTag` APIs and sets cache lifetime.
examples/experimental/src/app/ppr/page.tsx	Removes `experimental_ppr` flag export.
examples/experimental/src/app/api/revalidate/route.ts	Adjusts `revalidateTag` usage in the example.
examples/experimental/package.json	Updates example to Next 16.2 canary + React 19.2.4 and adds local scripts/overrides.
examples/experimental/open-next.config.ts	Consolidates local/dev OpenNext config and enables cache interception.
examples/experimental/open-next.config.local.ts	Removes local config file (merged into main config).
examples/experimental/next.config.ts	Updates Next config to use `cacheComponents`.
examples-cloudflare/e2e/experimental/package.json	Renames CF scripts to `*:cf`.
examples-cloudflare/e2e/experimental/open-next.config.ts	Enables cache interception for CF e2e experimental app.
examples-cloudflare/e2e/experimental/e2e/use-cache.test.ts	Skips ISR-related cache tests pending investigation.
examples-cloudflare/e2e/experimental/e2e/ppr.test.ts	Updates PPR expectations to match new header behavior.
examples-cloudflare/e2e/app-router/e2e/revalidateTag.test.ts	Updates expected `x-nextjs-cache` behavior.
examples-cloudflare/e2e/app-router/e2e/og.test.ts	Skips OG test pending fixes.

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-21T17:03:44Z

packages/open-next/src/core/routing/cacheInterceptor.ts

+			if (isDynamicISR && !isStaticRoute) {
+				pathToUse = Object.entries(PrerenderManifest?.dynamicRoutes ?? {}).find(([, dr]) => {
+					const regex = new RegExp(dr.routeRegex);
+					return regex.test(localizedPath);
+				})?.[1].fallback! as string;
+			} else if (localizedPath === "") {
+				pathToUse = "/index";
+			}
+			const cachedData = await globalThis.incrementalCache.get(pathToUse);


PrerenderManifest.dynamicRoutes[...].fallback can be string | false | null (per types). Casting with ?.[1].fallback! as string can produce false/null/undefined, which then gets passed to incrementalCache.get(pathToUse) and can throw or create invalid cache keys for dynamic ISR routes. Guard this by checking typeof fallback === "string" before using it, and fall back to localizedPath (or return event) when fallback is not a string.

Copilot · 2026-03-21T17:03:44Z

packages/open-next/src/core/routingHandler.ts

+			} else if (isPartialResult(cacheInterceptionResult)) {
+				// We need to apply the headers to both the result (the streamed response) and the resume request
+				applyMiddlewareHeaders(cacheInterceptionResult.result, headers);
+				applyMiddlewareHeaders(cacheInterceptionResult.resumeRequest, headers);
+				return {
+					internalEvent: cacheInterceptionResult.resumeRequest,
+					isExternalRewrite: false,
+					origin: false,
+					isISR: false,
+					resolvedRoutes,
+					initialURL: event.url,
+					locale: NextConfig.i18n ? detectLocale(eventOrResult, NextConfig.i18n) : undefined,
+					rewriteStatusCode: middlewareEventOrResult.rewriteStatusCode,
+					initialResponse: cacheInterceptionResult.result,
+				};


In the PartialResult path, middleware headers are applied to cacheInterceptionResult.result (an InternalResult). applyMiddlewareHeaders currently flattens string[] values via .join(","), which breaks multi-value headers like Set-Cookie (commas are not a valid delimiter there). For PPR initial responses this can corrupt cookies. Consider updating the middleware-header application logic to preserve string[] values on InternalResult.headers (at least for set-cookie) instead of joining them.

Copilot · 2026-03-21T17:03:44Z

packages/cloudflare/src/cli/templates/worker.ts

+				headers.set("content-encoding", "identity"); // To fix PPR locally
+
+				return new Response(body, {
+					status: reqOrResp.initialResponse.statusCode,
+					headers: headers,
+				});


headers.set("content-encoding", "identity") is applied unconditionally for all PPR responses. This disables compression and may negatively affect bandwidth/caching behavior in production. If this is only needed for wrangler dev/localhost, gate it on the request hostname or an env flag (similar to the conditional workaround in cloudflare-node wrapper).

Copilot · 2026-03-21T17:03:44Z

packages/cloudflare/src/cli/build/patches/plugins/route-module.spec.ts

 test("patch the createSnapshot function", () => {
+	//TODO: add the test for the composable cache handler
 	expect(


createComposableCacheHandlersRule is introduced/used in the patcher, but there’s currently no assertion covering it (note the TODO). Adding a targeted test that snapshots the diff produced by createComposableCacheHandlersRule would help prevent silent breakage across Next.js versions/minified output changes.

conico974 added 7 commits February 14, 2026 23:51

ppr support

cff3429

fix experimental in aws

965942c

port opennextjs/opennextjs-aws#1107

4c0ca94

add support for segment in PPR

7412842

fix composable cache

8ab24fb

fix experimental test

a74294d

make PPR work in cloudflare

13dbe1f

conico974 added 9 commits March 21, 2026 15:29

bump to 16.2.1

56aab40

port pr opennextjs/opennextjs-cloudflare#1151

92e3d80

fix composable cache cloudflare

be5ff13

fix: update Open-Graph tests to skip and assert cache behavior

f335594

format

5039611

fix: update revalidate tag test to assert "MISS" for x-nextjs-cache h…

0ab6ff2

…eader

enable experimental for cf

149a903

fix: rename build:worker script to build:worker:cf for clarity

e1c4939

fix: skip test for cached fetch in ISR due to unresolved issues

f1e93f4

conico974 marked this pull request as ready for review March 21, 2026 16:57

Copilot AI review requested due to automatic review settings March 21, 2026 16:57

Copilot started reviewing on behalf of conico974 March 21, 2026 16:57 View session

Copilot AI reviewed Mar 21, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add PPR support and improve caching mechanisms#24

Add PPR support and improve caching mechanisms#24
conico974 wants to merge 16 commits intomainfrom
conico/ppr-support

conico974 commented Feb 15, 2026 •

edited

Loading

Uh oh!

pkg-pr-new bot commented Feb 15, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

conico974 commented Feb 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkg-pr-new bot commented Feb 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

conico974 commented Feb 15, 2026 •

edited

Loading

pkg-pr-new bot commented Feb 15, 2026 •

edited

Loading