bump @opennextjs/aws to 3.7.1 (#816)

Sync opennextjs/opennextjs-aws#928

Author: vicb

.changeset/puny-trains-return.md

@@ -0,0 +1,7 @@
+---
+"@opennextjs/cloudflare": patch
+---
+
+bump @opennextjs/aws to 3.7.1
+
+See details at <https://github.com/opennextjs/opennextjs-aws/releases/tag/v3.7.1>

packages/cloudflare/package.json

@@ -53,7 +53,7 @@
 	"homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
 	"dependencies": {
 		"@dotenvx/dotenvx": "catalog:",
-		"@opennextjs/aws": "3.7.0",
+		"@opennextjs/aws": "3.7.1",
 		"cloudflare": "^4.4.1",
 		"enquirer": "^2.4.1",
 		"glob": "catalog:",

packages/cloudflare/src/cli/build/open-next/createServerBundle.ts

@@ -226,8 +226,8 @@ async function generateBundle(
 	const isBefore13413 = buildHelper.compareSemver(options.nextVersion, "<=", "13.4.13");
 	const isAfter141 = buildHelper.compareSemver(options.nextVersion, ">=", "14.1");
 	const isAfter142 = buildHelper.compareSemver(options.nextVersion, ">=", "14.2");
-
 	const isAfter152 = buildHelper.compareSemver(options.nextVersion, ">=", "15.2.0");
+	const isAfter154 = buildHelper.compareSemver(options.nextVersion, ">=", "15.4.0");
 
 	const disableRouting = isBefore13413 || config.middleware?.external;
 
@@ -240,6 +240,7 @@ async function generateBundle(
 				...(disableRouting ? ["withRouting"] : []),
 				...(isAfter142 ? ["patchAsyncStorage"] : []),
 				...(isAfter141 ? ["appendPrefetch"] : []),
+				...(isAfter154 ? [] : ["setInitialURL"]),
 			],
 		}),
 		openNextReplacementPlugin({

packages/cloudflare/src/cli/build/utils/ensure-cf-config.ts

@@ -1,4 +1,5 @@
 import logger from "@opennextjs/aws/logger.js";
+import type { ExternalMiddlewareConfig } from "@opennextjs/aws/types/open-next.js";
 
 import type { OpenNextConfig } from "../../../api/config.js";
 
@@ -8,6 +9,9 @@ import type { OpenNextConfig } from "../../../api/config.js";
  * @param config OpenNext configuration.
  */
 export function ensureCloudflareConfig(config: OpenNextConfig) {
+	const mwIsMiddlewareExternal = config.middleware?.external === true;
+	const mwConfig = mwIsMiddlewareExternal ? (config.middleware as ExternalMiddlewareConfig) : undefined;
+
 	const requirements = {
 		// Check for the default function
 		dftUseCloudflareWrapper: config.default?.override?.wrapper === "cloudflare-node",
@@ -24,10 +28,10 @@ export function ensureCloudflareConfig(config: OpenNextConfig) {
 			config.default?.override?.queue === "direct" ||
 			typeof config.default?.override?.queue === "function",
 		// Check for the middleware function
-		mwIsMiddlewareExternal: config.middleware?.external === true,
-		mwUseCloudflareWrapper: config.middleware?.override?.wrapper === "cloudflare-edge",
-		mwUseEdgeConverter: config.middleware?.override?.converter === "edge",
-		mwUseFetchProxy: config.middleware?.override?.proxyExternalRequest === "fetch",
+		mwIsMiddlewareExternal,
+		mwUseCloudflareWrapper: mwConfig?.override?.wrapper === "cloudflare-edge",
+		mwUseEdgeConverter: mwConfig?.override?.converter === "edge",
+		mwUseFetchProxy: mwConfig?.override?.proxyExternalRequest === "fetch",
 		hasCryptoExternal: config.edgeExternals?.includes("node:crypto"),
 	};