@opennextjs/aws 4.0.0 → 4.0.2

package/dist/adapters/plugins/image-optimization/image-optimization.replacement.js

@@ -5,20 +5,38 @@ import { debug } from "../../logger.js";
 //#override optimizeImage
 export async function optimizeImage(headers, imageParams, nextConfig, handleRequest) {
     const { isAbsolute, href } = imageParams;
-    // Signature for the fetch Image functions have changed in Next.js 15.5.16 and 16.2.5, so we need to check the version to determine how to call them.
-    const isAfter1625 = compareSemver(globalThis.nextVersion, ">=", "16.2.5");
-    const isAfter15516 = compareSemver(globalThis.nextVersion, ">=", "15.5.16") &&
+    // Signature for the fetch Image functions have changed across Next.js versions.
+    const isV15After15510 = compareSemver(globalThis.nextVersion, ">=", "15.5.10") &&
+        compareSemver(globalThis.nextVersion, "<", "16");
+    const isV15After15515 = compareSemver(globalThis.nextVersion, ">=", "15.5.16") &&
         compareSemver(globalThis.nextVersion, "<", "16");
-    const isNewArgsForInternalFetch = isAfter1625 || isAfter15516;
+    const isV16Plus = compareSemver(globalThis.nextVersion, ">=", "16");
+    const isAfter1615 = compareSemver(globalThis.nextVersion, ">=", "16.1.5");
+    const isAfter1625 = compareSemver(globalThis.nextVersion, ">=", "16.2.5");
+    // fetchInternalImage signature varies across Next.js versions:
+    //   <=v15.5.15, v16.0.0–v16.2.4: fetchInternalImage(href, req, res, handleRequest)
+    //   v15.5.16–v15.x, v16.2.5+:    fetchInternalImage(href, req, res, maximumResponseBody, handleRequest)
+    const isNewArgsForInternalFetch = isAfter1625 || isV15After15515;
+    // fetchExternalImage signature varies across Next.js versions:
+    //   <=v15.5.9:       fetchExternalImage(href)
+    //   v15.5.10–v15.x:  fetchExternalImage(href, maximumResponseBody)
+    //   v16.0.0–v16.1.4: fetchExternalImage(href, dangerouslyAllowLocalIP)
+    //   v16.1.5+:        fetchExternalImage(href, dangerouslyAllowLocalIP, maximumResponseBody)
     // The default value for maximumResponseBody is 50KB in Next code
     // https://github.com/vercel/next.js/blob/0f38c522/packages/next/src/shared/lib/image-config.ts#L164
     const maximumResponseBody = nextConfig.images?.maximumResponseBody || 50_000_000;
     const imageUpstream = isAbsolute
         ? // https://github.com/vercel/next.js/blob/bfe2ab4/packages/next/src/server/image-optimizer.ts#L711
-            await (isNewArgsForInternalFetch
+            await (isAfter1615
                 ? fetchExternalImage(href, false, maximumResponseBody)
-                : //@ts-expect-error - fetchExternalImage signature has changed in Next.js 16, it has an extra boolean parameter.
-                    fetchExternalImage(href))
+                : isV16Plus
+                    ? // @ts-expect-error - fetchExternalImage signature varies across Next.js versions
+                        fetchExternalImage(href, false)
+                    : isV15After15510
+                        ? // @ts-expect-error - fetchExternalImage signature varies across Next.js versions
+                            fetchExternalImage(href, maximumResponseBody)
+                        : // @ts-expect-error - fetchExternalImage signature varies across Next.js versions
+                            fetchExternalImage(href))
         : await (isNewArgsForInternalFetch
             ? fetchInternalImage(href, 
             // @ts-expect-error - It is supposed to be an IncomingMessage object, but only the headers are used.

package/dist/core/routing/cacheInterceptor.js

@@ -119,7 +119,7 @@ async function generateResult(event, localizedPath, cachedValue, lastModified, i
     let isDataRequest = false;
     let additionalHeaders = {};
     if (cachedValue.type === "app") {
-        isDataRequest = Boolean(event.headers.rsc);
+        isDataRequest = event.headers.rsc === "1";
         if (isDataRequest) {
             const { body: appRouterBody, additionalHeaders: appHeaders } = getBodyForAppRouter(event, cachedValue);
             body = appRouterBody;

package/dist/core/routing/matcher.js

@@ -208,7 +208,7 @@ function handleTrailingSlashRedirect(event) {
     }
     const emptyBody = emptyReadableStream();
     if (NextConfig.trailingSlash &&
-        !event.headers["x-nextjs-data"] &&
+        !(event.query.__nextDataReq === "1") &&
         !event.rawPath.endsWith("/") &&
         !event.rawPath.match(/[\w-]+\.[\w]+$/g)) {
         const headersLocation = event.url.split("?");

package/dist/core/routingHandler.js

@@ -23,6 +23,22 @@ const geoHeaderToNextHeader = {
     "x-open-next-latitude": "x-vercel-ip-latitude",
     "x-open-next-longitude": "x-vercel-ip-longitude",
 };
+// Those are internal headers from Next.js that should not be set by users
+// We strip them for the incoming request - To be updated when Next.js adds new internal headers
+// https://github.com/vercel/next.js/blob/ed1c6cc/packages/next/src/server/lib/server-ipc/utils.ts#L42-L53
+// NOTE: Use lowercase format.
+const NEXT_INTERNAL_HEADERS = [
+    "x-middleware-rewrite",
+    "x-middleware-redirect",
+    "x-middleware-set-cookie",
+    "x-middleware-skip",
+    "x-middleware-override-headers",
+    "x-middleware-next",
+    "x-now-route-matches",
+    "x-matched-path",
+    "x-nextjs-data",
+    "x-next-resume-state-length",
+];
 /**
  * Adds the middleware headers to an event or result.
  *
@@ -53,8 +69,10 @@ export default async function routingHandler(event, { assetResolver }) {
         // First we remove internal headers
         // We don't want to allow users to set these headers
         for (const key of Object.keys(event.headers)) {
-            if (key.startsWith(INTERNAL_HEADER_PREFIX) ||
-                key.startsWith(MIDDLEWARE_HEADER_PREFIX)) {
+            const lowerCaseKey = key.toLowerCase();
+            if (lowerCaseKey.startsWith(INTERNAL_HEADER_PREFIX) ||
+                lowerCaseKey.startsWith(MIDDLEWARE_HEADER_PREFIX) ||
+                NEXT_INTERNAL_HEADERS.includes(lowerCaseKey)) {
                 delete event.headers[key];
             }
         }

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -60,7 +60,7 @@
     "typescript": "5.9.3"
   },
   "peerDependencies": {
-    "next": ">=15.5.16 <16 || >=16.2.5"
+    "next": ">=15.5.18 <16 || >=16.2.6"
   },
   "bugs": {
     "url": "https://github.com/opennextjs/opennextjs-aws/issues"