Port multiple PRs from source repositories

.changeset/port-pr-1083.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1083 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1083

.changeset/port-pr-1097.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1097 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1097

.changeset/port-pr-1105.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1105 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1105

.changeset/port-pr-1122-aws.md

@@ -0,0 +1,9 @@
+---
+"@opennextjs/aws": patch
+---
+
+Ported PR #1122 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1122
+
+Changed `checkRunningInsideNextjsApp` function signature to accept `{ appPath: string }` instead of full `BuildOptions` object, making it more flexible for use in the migrate command.

.changeset/port-pr-1122-cloudflare.md

@@ -0,0 +1,13 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1122 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1122
+
+Applied bugfixes and improvements to the `migrate` command:
+
+- Fixed extra newlines when appending to files (updated `conditionalAppendFileSync` function signature to use options object with `appendIf` and `appendPrefix`)
+- Fixed error when `public` directory is missing (now creates parent directories automatically)
+- Fixed Next.js config file update to check if the file exists before attempting to update

.changeset/port-pr-1126.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1126 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1126

.changeset/port-pr-1127.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1127 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1127

.changeset/port-pr-1133.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1133 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1133

.changeset/port-pr-1138.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1138 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1138

.changeset/port-pr-1142.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1142 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1142

.changeset/port-pr-1146.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1146 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1146

.changeset/port-pr-1147.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1147 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1147

.changeset/port-pr-1150.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+Ported PR #1150 from source repository
+
+https://github.com/opennextjs/opennextjs-cloudflare/pull/1150

.claude/skills/port-pr/SKILL.md

@@ -64,17 +64,17 @@ Apply similar changes following this repository's conventions:
 After implementation, run:
 
 ```bash
-pnpm code:checks
+pnpm code:checks 2>&1 | tail -20
 ```
 
-This runs formatting, linting, and TypeScript checks.
+This runs formatting, linting, and TypeScript checks. Only the tail of the output is shown to see the result.
 
 ### 7. Run Unit Tests
 
 After code checks pass, run only the unit tests from the tests-unit package:
 
 ```bash
-pnpm --filter tests-unit test
+pnpm --filter tests-unit test 2>&1 | tail -20
 ```
 
 **Important:** Do NOT run `pnpm test` (which runs all tests), `pnpm e2e:test`, or any full test suite. Only unit tests from the tests-unit package should be run during the porting process.
@@ -105,32 +105,46 @@ Ported PR #$PR_NUMBER from source repository
 $ARGUMENTS" > .changeset/port-pr-$PR_NUMBER.md
 ```
 
-### 10. Stage Changes and Prepare Commit
+### 10. Stage All Files
 
-Stage the changeset file and prepare a commit message (but do not commit):
+Stage all files that were modified or created during the port:
 
 ```bash
-# Stage the changeset file
-git add .changeset/port-pr-$PR_NUMBER.md
+git status --short
+git add .changeset/port-pr-$PR_NUMBER.md <other-modified-files>
+```
 
-# Prepare the commit message with the PR link (stored for later)
-echo "chore: port PR #$PR_NUMBER from source repository
+### 11. Ask for Commit
 
-$ARGUMENTS
+Ask the user if they want to commit the changes directly:
 
-Changeset: .changeset/port-pr-$PR_NUMBER.md" > /tmp/commit-message-port-pr-$PR_NUMBER.txt
+Ask the user: **"Should I stage all files and commit the ported PR changes now?"**
 
-# Display the prepared commit message
-cat /tmp/commit-message-port-pr-$PR_NUMBER.txt
-```
+Options:
 
-The changeset is staged and ready to commit. The commit message is saved at `/tmp/commit-message-port-pr-$PR_NUMBER.txt` for reference.
+- "Yes, commit now" - Stage all files and commit with the prepared message
+- "No, I'll commit manually" - Let the user stage and commit themselves
+
+If the user chooses to commit:
+
+```bash
+# Stage all modified and new files
+git add <all-modified-files>
+
+# Commit with the prepared message
+git commit -m "chore: port PR #$PR_NUMBER from source repository
+
+$ARGUMENTS
+
+Changeset: .changeset/port-pr-$PR_NUMBER.md"
+```
 
-### 11. Summary
+### 12. Summary
 
 Provide a summary of:
 
 - What was ported
 - Any adaptations made
 - Files modified/created
+- Whether the changes were committed
 - Any remaining TODOs or follow-up items

create-cloudflare/next/package.json

@@ -13,7 +13,7 @@
 		"cf-typegen": "wrangler types --env-interface CloudflareEnv ./cloudflare-env.d.ts"
 	},
 	"dependencies": {
-		"@opennextjs/cloudflare": "^1.15.1",
+		"@opennextjs/cloudflare": "^1.17.1",
 		"next": "16.1.4",
 		"react": "19.1.4",
 		"react-dom": "19.1.4"

create-cloudflare/next/wrangler.jsonc

@@ -6,7 +6,7 @@
 	"$schema": "node_modules/wrangler/config-schema.json",
 	"name": "worker_name",
 	"main": ".open-next/worker.js",
-	"compatibility_date": "2025-12-01",
+	"compatibility_date": "<COMPATIBILITY_DATE>",
 	"compatibility_flags": ["nodejs_compat", "global_fetch_strictly_public"],
 	"assets": {
 		"binding": "ASSETS",

packages/cloudflare/package.json

@@ -54,6 +54,7 @@
 		"@dotenvx/dotenvx": "catalog:",
 		"@opennextjs/aws": "workspace:*",
 		"cloudflare": "^4.4.1",
+		"comment-json": "^4.5.1",
 		"enquirer": "^2.4.1",
 		"glob": "catalog:",
 		"ts-tqdm": "^0.8.6",
@@ -62,6 +63,7 @@
 	"devDependencies": {
 		"@cloudflare/workers-types": "catalog:",
 		"@tsconfig/strictest": "catalog:",
+		"@types/comment-json": "^2.4.5",
 		"@types/mock-fs": "catalog:",
 		"@types/node": "catalog:",
 		"@types/picomatch": "^4.0.0",

packages/cloudflare/src/api/overrides/asset-resolver/index.spec.ts

@@ -1,7 +1,80 @@
-import { describe, expect, test } from "vitest";
+import { beforeEach, describe, expect, test, vi } from "vitest";
 
 import { isUserWorkerFirst } from "./index.js";
 
+const mockAssetsFetch = vi.fn();
+
+vi.mock("../../cloudflare-context.js", () => ({
+	getCloudflareContext: () => ({
+		env: {
+			ASSETS: { fetch: mockAssetsFetch },
+		},
+	}),
+}));
+
+describe("maybeGetAssetResult", () => {
+	let resolver: typeof import("./index.js").default;
+
+	beforeEach(async () => {
+		vi.resetModules();
+		mockAssetsFetch.mockReset();
+		globalThis.__ASSETS_RUN_WORKER_FIRST__ = true;
+		resolver = (await import("./index.js")).default;
+	});
+
+	const makeEvent = (method: string, rawPath: string) =>
+		({
+			method,
+			rawPath,
+			headers: { accept: "*/*" },
+		}) as Parameters<typeof resolver.maybeGetAssetResult>[0];
+
+	test("GET request returns response body", async () => {
+		const body = new ReadableStream();
+		mockAssetsFetch.mockResolvedValue(new Response(body, { status: 200 }));
+
+		const result = await resolver.maybeGetAssetResult(makeEvent("GET", "/style.css"));
+
+		expect(result).toBeDefined();
+		expect(result!.statusCode).toBe(200);
+		expect(result!.body).not.toBeNull();
+	});
+
+	test("HEAD request returns null body", async () => {
+		mockAssetsFetch.mockResolvedValue(new Response(null, { status: 200 }));
+
+		const result = await resolver.maybeGetAssetResult(makeEvent("HEAD", "/style.css"));
+
+		expect(result).toBeDefined();
+		expect(result!.statusCode).toBe(200);
+		expect(result!.body).toBeNull();
+	});
+
+	test("returns undefined for 404 responses", async () => {
+		mockAssetsFetch.mockResolvedValue(new Response(null, { status: 404 }));
+
+		const result = await resolver.maybeGetAssetResult(makeEvent("GET", "/missing.css"));
+
+		expect(result).toBeUndefined();
+	});
+
+	test("returns undefined for POST requests", async () => {
+		const result = await resolver.maybeGetAssetResult(makeEvent("POST", "/style.css"));
+
+		expect(result).toBeUndefined();
+		expect(mockAssetsFetch).not.toHaveBeenCalled();
+	});
+
+	test("returns undefined when run_worker_first is false", async () => {
+		globalThis.__ASSETS_RUN_WORKER_FIRST__ = false;
+
+		const result = await resolver.maybeGetAssetResult(makeEvent("GET", "/style.css"));
+
+		expect(result).toBeUndefined();
+		expect(mockAssetsFetch).not.toHaveBeenCalled();
+	});
+});
+
 describe("isUserWorkerFirst", () => {
 	test("run_worker_first = false", () => {
 		expect(isUserWorkerFirst(false, "/test")).toBe(false);

packages/cloudflare/src/api/overrides/asset-resolver/index.ts

@@ -44,14 +44,33 @@ const resolver: AssetResolver = {
 			type: "core",
 			statusCode: response.status,
 			headers: Object.fromEntries(response.headers.entries()),
-			// Workers and Node types differ.
-			// oxlint-disable-next-line @typescript-eslint/no-explicit-any
-			body: response.body || (new ReadableStream() as any),
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			body: getResponseBody(method, response) as any,
 			isBase64Encoded: false,
 		} satisfies InternalResult;
 	},
 };
 
+/**
+ * Returns the response body for an asset result.
+ *
+ * HEAD responses must return `null` because `response.body` is `null` per the HTTP spec
+ * and the `new ReadableStream()` fallback would create a stream that never closes, hanging the Worker.
+ *
+ * @param method - The HTTP method of the request.
+ * @param response - The response from the ASSETS binding.
+ * @returns The body to use in the internal result.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function getResponseBody(method: string, response: Response): ReadableStream<any> | null {
+	if (method === "HEAD") {
+		return null;
+	}
+	// Workers and Node ReadableStream types differ.
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	return response.body || (new ReadableStream() as any);
+}
+
 /**
  * @param runWorkerFirst `run_worker_first` config
  * @param pathname pathname of the request

packages/cloudflare/src/api/overrides/incremental-cache/regional-cache.ts

@@ -9,8 +9,6 @@ import {
 import { getCloudflareContext } from "../../cloudflare-context.js";
 import { debugCache, FALLBACK_BUILD_ID, IncrementalCacheEntry, isPurgeCacheEnabled } from "../internal.js";
 
-import { NAME as KV_CACHE_NAME } from "./kv-incremental-cache.js";
-
 const ONE_MINUTE_IN_SECONDS = 60;
 const THIRTY_MINUTES_IN_SECONDS = ONE_MINUTE_IN_SECONDS * 30;
 
@@ -79,20 +77,17 @@ class RegionalCache implements IncrementalCache {
 		private store: IncrementalCache,
 		private opts: Options
 	) {
-		if (this.store.name === KV_CACHE_NAME) {
-			throw new Error("The KV incremental cache does not need a regional cache.");
-		}
 		this.name = this.store.name;
+		// `shouldLazilyUpdateOnCacheHit` is not needed when cache purge is enabled.
 		this.opts.shouldLazilyUpdateOnCacheHit ??= this.opts.mode === "long-lived" && !isPurgeCacheEnabled();
 	}
 
 	get #bypassTagCacheOnCacheHit(): boolean {
 		if (this.opts.bypassTagCacheOnCacheHit !== undefined) {
-			// If the bypassTagCacheOnCacheHit option is set we return that one
 			return this.opts.bypassTagCacheOnCacheHit;
 		}
 
-		// Otherwise we default to whether the automatic cache purging is enabled or not
+		// When `bypassTagCacheOnCacheHit` is not set, we default to whether the automatic cache purging is enabled or not
 		return isPurgeCacheEnabled();
 	}
 
@@ -238,17 +233,7 @@ class RegionalCache implements IncrementalCache {
  * a request is made to another region that has an entry stored in its regional cache.
  *
  * @param cache Incremental cache instance.
- * @param opts.mode The mode to use for the regional cache.
- *                  - `short-lived`: Re-use a cache entry for up to a minute after it has been retrieved.
- *                  - `long-lived`: Re-use a fetch cache entry until it is revalidated (per-region),
- *                                  or an ISR/SSG entry for up to 30 minutes.
- * @param opts.shouldLazilyUpdateOnCacheHit Whether the regional cache entry should be updated in
- *                                          the background or not when it experiences a cache hit.
- * @param opts.defaultLongLivedTtlSec The default age to use for long-lived cache entries.
- *                                  When no revalidate is provided, the default age will be used.
- *                                  @default `THIRTY_MINUTES_IN_SECONDS`
- *
- * @default `false` for the `short-lived` mode, and `true` for the `long-lived` mode.
+ * @param opts Options for the regional cache.
  */
 export function withRegionalCache(cache: IncrementalCache, opts: Options) {
 	return new RegionalCache(cache, opts);