Use @next/routing

.github/actions/setup/action.yml

@@ -10,9 +10,9 @@ runs:
   using: composite
   steps:
     - name: Install pnpm
-      uses: pnpm/action-setup@v6
+      uses: pnpm/setup@v2
       with:
-        version: 10
+        install: false
 
     - name: Install Node.js ${{ inputs.node-version }}
       uses: actions/setup-node@v7

.github/workflows/e2e.yml

@@ -92,9 +92,9 @@ jobs:
           aws-region: us-east-1
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v6
+        uses: pnpm/setup@v2
         with:
-          version: 10
+          install: false
 
       - name: Set up NodeJS
         uses: actions/setup-node@v7

.oxlintrc.json

@@ -14,7 +14,7 @@
 		"@typescript-eslint/no-redeclare": "error",
 		"no-unused-vars": "off",
 		"no-delete-var": "off",
-		"no-param-reassign": "warn",
+		"no-param-reassign": "off",
 		"no-sequences": "warn",
 		"unicorn/prefer-node-protocol": "error",
 		"import/first": "error",

examples-cloudflare/e2e/app-router/e2e/headers.test.ts

@@ -29,7 +29,7 @@ test("Headers", async ({ page }) => {
 	expect(headers["x-opennext-requestid"]).not.toBeFalsy();
 });
 /**
- * Tests that the middleware headers are applied after next.config.js headers. Requires 'dangerous.middlewareHeadersOverrideNextConfigHeaders' to be set.
+ * Tests that the middleware headers are applied after next.config.js headers.
  */
 test("Middleware headers override next.config.js headers", async ({ page }) => {
 	const responsePromise = page.waitForResponse((response) => {

examples-cloudflare/e2e/app-router/e2e/middleware.rewrite.test.ts

@@ -63,5 +63,5 @@ test("Middleware Rewrite Status Code", async ({ page }) => {
 	await page.goto("/rewrite-status-code");
 	const el = page.getByText("Rewritten Destination", { exact: true });
 	await expect(el).toBeVisible();
-	expect(statusPromise).resolves.toEqual(403);
+	await expect(statusPromise).resolves.toEqual(403);
 });

examples-cloudflare/e2e/app-router/open-next.config.ts

@@ -24,10 +24,4 @@ const baseConfig = defineCloudflareConfig({
 	queue: queueCache(doQueue),
 });
 
-export default {
-	...baseConfig,
-	dangerous: {
-		...baseConfig.dangerous,
-		middlewareHeadersOverrideNextConfigHeaders: true,
-	},
-};
+export default baseConfig;

examples-cloudflare/e2e/app-router/proxy.ts

@@ -47,7 +47,7 @@ export default function middleware(request: NextRequest) {
 	// Response headers should show up in the client's response headers
 	responseHeaders.set("response-header", "response-header");
 
-	// For dangerous.middlewareHeadersOverrideNextConfigHeaders we need to verify that middleware headers override next.config.js headers.
+	// We need to verify that middleware headers override next.config.js headers.
 	if (path === "/headers/override-from-middleware") {
 		responseHeaders.set("e2e-headers", "middleware");
 		return NextResponse.json({}, { headers: responseHeaders });

examples-cloudflare/playground16/package.json

@@ -17,7 +17,7 @@
 		"cf-typegen": "wrangler types --env-interface CloudflareEnv"
 	},
 	"dependencies": {
-		"next": "16.1.4",
+		"next": "16.2.1",
 		"react": "19.2.3",
 		"react-dom": "19.2.3"
 	},

examples/app-router/open-next.config.ts

@@ -11,10 +11,6 @@ export default {
 		},
 	},
 
-	dangerous: {
-		middlewareHeadersOverrideNextConfigHeaders: true,
-	},
-
 	imageOptimization: {
 		override: {
 			wrapper: "dummy",

examples/app-router/proxy.ts

@@ -47,7 +47,7 @@ export default function proxy(request: NextRequest) {
 	// Response headers should show up in the client's response headers
 	responseHeaders.set("response-header", "response-header");
 
-	// For dangerous.middlewareHeadersOverrideNextConfigHeaders we need to verify that middleware headers override next.config.js headers.
+	// We need to verify that middleware headers override next.config.js headers.
 	if (path === "/headers/override-from-middleware") {
 		responseHeaders.set("e2e-headers", "middleware");
 		return NextResponse.json({}, { headers: responseHeaders });

package.json

@@ -38,5 +38,6 @@
 	"engines": {
 		"node": ">=24",
 		"pnpm": ">=10"
-	}
+	},
+	"packageManager": "pnpm@11.25.0"
 }

packages/aws/bin/open-next.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import "../dist/index.js";

packages/aws/package.json

@@ -15,10 +15,11 @@
 		"directory": "packages/open-next"
 	},
 	"bin": {
-		"open-next": "./dist/index.js"
+		"open-next": "./bin/open-next.js"
 	},
 	"files": [
 		"dist",
+		"bin",
 		"assets",
 		"README.md"
 	],
@@ -75,6 +76,6 @@
 		"typescript": "catalog:"
 	},
 	"peerDependencies": {
-		"next": "^16.0.10"
+		"next": "16.2.1"
 	}
 }

packages/cloudflare/bin/opennextjs-cloudflare.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import "../dist/cli/index.js";

packages/cloudflare/package.json

@@ -19,10 +19,11 @@
 		"directory": "packages/cloudflare"
 	},
 	"bin": {
-		"opennextjs-cloudflare": "dist/cli/index.js"
+		"opennextjs-cloudflare": "bin/opennextjs-cloudflare.js"
 	},
 	"files": [
 		"README.md",
+		"bin",
 		"dist",
 		"templates"
 	],
@@ -72,14 +73,14 @@
 		"esbuild": "catalog:",
 		"globals": "catalog:",
 		"mock-fs": "catalog:",
-		"next": "catalog:",
+		"next": "catalog:aws",
 		"picomatch": "^4.0.2",
 		"rimraf": "catalog:",
 		"typescript": "catalog:",
 		"vitest": "catalog:"
 	},
 	"peerDependencies": {
-		"next": "^16.0.10",
+		"next": "16.2.1",
 		"wrangler": "catalog:"
 	}
 }

packages/cloudflare/src/cli/utils/nextjs-support.spec.ts

@@ -0,0 +1,15 @@
+import { describe, expect, test } from "vitest";
+
+import { ensureNextjsVersionSupported } from "./nextjs-support.js";
+
+describe("ensureNextjsVersionSupported", () => {
+	test("rejects versions without the routing-aware adapter contract", async () => {
+		await expect(ensureNextjsVersionSupported({ nextVersion: "16.2.0" })).rejects.toThrow(
+			"please upgrade to version 16.2.1 or greater"
+		);
+	});
+
+	test("accepts the version required by the adapter peer dependency", async () => {
+		await expect(ensureNextjsVersionSupported({ nextVersion: "16.2.1" })).resolves.toBeUndefined();
+	});
+});

packages/cloudflare/src/cli/utils/nextjs-support.ts

@@ -1,9 +1,16 @@
 import { compareSemver } from "@opennextjs/core/build/helper.js";
 import logger from "@opennextjs/core/logger.js";
 
-export async function ensureNextjsVersionSupported({ nextVersion }: { nextVersion: string }) {
-	if (compareSemver(nextVersion, "<", "14.2.0")) {
-		throw new Error("Next.js version unsupported, please upgrade to version 14.2 or greater.");
+/**
+ * Verifies that Next.js and Wrangler support the adapter contract.
+ *
+ * @param options The installed Next.js version.
+ * @returns A promise that resolves when the versions are supported.
+ * @throws When Next.js predates the routing-aware adapter contract.
+ */
+export async function ensureNextjsVersionSupported({ nextVersion }: { nextVersion: string }): Promise<void> {
+	if (compareSemver(nextVersion, "<", "16.2.1")) {
+		throw new Error("Next.js version unsupported, please upgrade to version 16.2.1 or greater.");
 	}
 
 	const {

packages/core/package.json

@@ -69,6 +69,7 @@
 		"vitest": "catalog:"
 	},
 	"peerDependencies": {
-		"next": "^16.0.10"
+		"@next/routing": "16.2.1",
+		"next": "16.2.1"
 	}
 }

packages/core/src/adapters/config/index.ts

@@ -3,18 +3,13 @@ import path from "node:path";
 import { debug } from "../logger";
 
 import {
-	loadAppPathRoutesManifest,
-	loadAppPathsManifest,
-	loadAppPathsManifestKeys,
 	loadBuildId,
 	loadConfig,
-	loadConfigHeaders,
 	loadFunctionsConfigManifest,
 	loadHtmlPages,
 	loadMiddlewareManifest,
-	loadPagesManifest,
 	loadPrerenderManifest,
-	loadRoutesManifest,
+	loadRoutingConfig,
 } from "./util.js";
 
 export const NEXT_DIR = path.join(__dirname, ".next");
@@ -24,17 +19,10 @@ debug({ NEXT_DIR, OPEN_NEXT_DIR });
 
 export const NextConfig = /* @__PURE__ */ loadConfig(NEXT_DIR);
 export const BuildId = /* @__PURE__ */ loadBuildId(NEXT_DIR);
+export const RoutingConfig = /* @__PURE__ */ loadRoutingConfig(NEXT_DIR);
 export const HtmlPages = /* @__PURE__ */ loadHtmlPages(NEXT_DIR);
-// export const PublicAssets = loadPublicAssets(OPEN_NEXT_DIR);
-export const RoutesManifest = /* @__PURE__ */ loadRoutesManifest(NEXT_DIR);
-export const ConfigHeaders = /* @__PURE__ */ loadConfigHeaders(NEXT_DIR);
 export const PrerenderManifest = /* @__PURE__ */ loadPrerenderManifest(NEXT_DIR);
-export const PagesManifest = /* @__PURE__ */ loadPagesManifest(NEXT_DIR);
-export const AppPathsManifestKeys = /* @__PURE__ */ loadAppPathsManifestKeys(NEXT_DIR);
 export const MiddlewareManifest = /* @__PURE__ */ loadMiddlewareManifest(NEXT_DIR);
-export const AppPathsManifest = /* @__PURE__ */ loadAppPathsManifest(NEXT_DIR);
-export const AppPathRoutesManifest = /* @__PURE__ */ loadAppPathRoutesManifest(NEXT_DIR);
-
 export const FunctionsConfigManifest = /* @__PURE__ */ loadFunctionsConfigManifest(NEXT_DIR);
 
 process.env.NEXT_BUILD_ID = BuildId;