@opennextjs/aws 4.0.1 → 4.0.3

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

@@ -5,28 +5,62 @@ 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") &&
-        compareSemver(globalThis.nextVersion, "<", "16");
-    const isNewArgsForInternalFetch = isAfter1625 || isAfter15516;
     // 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
-                ? fetchExternalImage(href, false, maximumResponseBody)
-                : //@ts-expect-error - fetchExternalImage signature has changed in Next.js 16, it has an extra boolean parameter.
-                    fetchExternalImage(href))
-        : await (isNewArgsForInternalFetch
-            ? fetchInternalImage(href, 
+    /**
+     * 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)
+     *
+     * https://github.com/vercel/next.js/blob/bfe2ab4/packages/next/src/server/image-optimizer.ts#L711
+     */
+    const callFetchExternalImage = () => {
+        const version = globalThis.nextVersion;
+        // v16.1.5+
+        if (compareSemver(version, ">=", "16.1.5")) {
+            return fetchExternalImage(href, false, maximumResponseBody);
+        }
+        // v16.0.0–v16.1.4
+        if (compareSemver(version, ">=", "16")) {
+            // @ts-expect-error - fetchExternalImage signature varies across Next.js versions
+            return fetchExternalImage(href, false);
+        }
+        // v15.5.10–v15.x
+        if (compareSemver(version, ">=", "15.5.10")) {
+            // @ts-expect-error - fetchExternalImage signature varies across Next.js versions
+            return fetchExternalImage(href, maximumResponseBody);
+        }
+        // <=v15.5.9
+        // @ts-expect-error - fetchExternalImage signature varies across Next.js versions
+        return fetchExternalImage(href);
+    };
+    /**
+     * 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 callFetchInternalImage = () => {
+        const version = globalThis.nextVersion;
+        const isV15WithNewArgs = compareSemver(version, ">=", "15.5.16") &&
+            compareSemver(version, "<", "16");
+        // v15.5.16–v15.x, v16.2.5+
+        if (isV15WithNewArgs || compareSemver(version, ">=", "16.2.5")) {
+            return fetchInternalImage(href, 
             // @ts-expect-error - It is supposed to be an IncomingMessage object, but only the headers are used.
             { headers }, {}, // res object is not necessary as it's not actually used.
-            maximumResponseBody, handleRequest)
-            : // @ts-expect-error - fetchInternalImage signature has changed in Next.js 15.5.16 and 16.2.5
-                fetchInternalImage(href, { headers }, {}, // res object is not necessary as it's not actually used.
-                handleRequest));
+            maximumResponseBody, handleRequest);
+        }
+        // <=v15.5.15, v16.0.0–v16.2.4
+        // @ts-expect-error - fetchInternalImage signature has changed in Next.js 15.5.16 and 16.2.5
+        return fetchInternalImage(href, { headers }, {}, // res object is not necessary as it's not actually used.
+        handleRequest);
+    };
+    const imageUpstream = isAbsolute
+        ? await callFetchExternalImage()
+        : await callFetchInternalImage();
     const result = await imageOptimizer(imageUpstream, imageParams, 
     // @ts-ignore
     nextConfig, false);

package/dist/core/routing/matcher.js

@@ -287,6 +287,10 @@ export function fixDataPage(internalEvent, buildId) {
             ...internalEvent,
             rawPath: newPath,
             query,
+            headers: {
+                ...internalEvent.headers,
+                "x-nextjs-data": "1",
+            },
             url: new URL(`${newPath}${convertToQueryString(query)}`, internalEvent.url).href,
         };
     }

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "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"