@opennextjs/aws 4.1.2 → 4.1.4

package/dist/adapters/edge-adapter.js

@@ -28,15 +28,15 @@ const defaultHandler = async (internalEvent, options) => {
         });
         const responseHeaders = {};
         response.headers.forEach((value, key) => {
-            if (key.toLowerCase() === "set-cookie") {
-                responseHeaders[key] = responseHeaders[key]
-                    ? [...responseHeaders[key], value]
-                    : [value];
-            }
-            else {
-                responseHeaders[key] = value;
-            }
+            // Headers.forEach folds same-name headers; use getSetCookie() below instead.
+            if (key.toLowerCase() === "set-cookie")
+                return;
+            responseHeaders[key] = value;
         });
+        const setCookies = response.headers.getSetCookie();
+        if (setCookies.length > 0) {
+            responseHeaders["set-cookie"] = setCookies;
+        }
         const body = response.body ?? emptyReadableStream();
         return {
             type: "core",

package/dist/build/createImageOptimizationBundle.js

@@ -74,7 +74,7 @@ export async function createImageOptimizationBundle(options) {
     // Sharp provides pre-build binaries for all platforms. https://github.com/lovell/sharp/blob/main/docs/install.md#cross-platform
     // Target should be same as used by Lambda, see https://github.com/sst/sst/blob/ca6f763fdfddd099ce2260202d0ce48c72e211ea/packages/sst/src/constructs/NextjsSite.ts#L114
     // For SHARP_IGNORE_GLOBAL_LIBVIPS see: https://github.com/lovell/sharp/blob/main/docs/install.md#aws-lambda
-    const sharpVersion = process.env.SHARP_VERSION ?? "0.35.3";
+    const sharpVersion = process.env.SHARP_VERSION ?? "0.35.4";
     // In development, we want to use the local machine settings
     const isDev = config.imageOptimization?.loader === "fs-dev";
     installDependencies(outputPath, config.imageOptimization?.install ?? {

package/dist/core/routing/cacheInterceptor.js

@@ -169,12 +169,7 @@ async function generateResult(event, localizedPath, cachedValue, lastModified, i
         return undefined;
     }
     const cacheControl = await computeCacheControl(localizedPath, body, event.headers.host, cachedValue.revalidate, lastModified, isStaleFromTagCache);
-    // Sometimes other status codes can be cached, like 404. For these cases, we should return the correct status code
-    // Also set the status code to the rewriteStatusCode if defined
-    // This can happen in handleMiddleware in routingHandler.
-    // `NextResponse.rewrite(url, { status: xxx})
-    // The rewrite status code should take precedence over the cached one
-    const statusCode = event.rewriteStatusCode ?? cachedValue.meta?.status ?? 200;
+    const statusCode = computeStatusCode(event.rewriteStatusCode, cachedValue.meta?.status);
     const headers = {
         ...cacheControl,
         "content-type": type,
@@ -195,6 +190,26 @@ async function generateResult(event, localizedPath, cachedValue, lastModified, i
         headers,
     };
 }
+/**
+ * Computes the status code to return for a cache hit.
+ *
+ * Sometimes other status codes can be cached, like 404. For these cases, we should return the correct status code.
+ * The rewrite status code can be set in handleMiddleware in routingHandler with
+ * `NextResponse.rewrite(url, { status: xxx })`.
+ *
+ * A meaningful cached status code (i.e. anything but the implicit 200) wins over the rewrite
+ * status code, otherwise a rewrite would turn a cached error page into a successful response.
+ *
+ * @param rewriteStatusCode The status code from the middleware rewrite, if any.
+ * @param cachedStatusCode The status code stored in the cache entry meta, if any.
+ * @returns The status code to return.
+ */
+function computeStatusCode(rewriteStatusCode, cachedStatusCode) {
+    if (cachedStatusCode !== undefined && cachedStatusCode !== 200) {
+        return cachedStatusCode;
+    }
+    return rewriteStatusCode ?? cachedStatusCode ?? 200;
+}
 /**
  *
  * https://github.com/vercel/next.js/blob/34039551d2e5f611c0abde31a197d9985918adaf/packages/next/src/shared/lib/router/utils/escape-path-delimiters.ts#L2-L10
@@ -298,7 +313,7 @@ export async function cacheInterceptor(event) {
                 case "route": {
                     const cacheControl = await computeCacheControl(localizedPath, cachedData.value.body, host, cachedData.value.revalidate, cachedData.lastModified, _isStale);
                     const isBinary = isBinaryContentType(String(cachedData.value.meta?.headers?.["content-type"]));
-                    const statusCode = event.rewriteStatusCode ?? cachedData.value.meta?.status ?? 200;
+                    const statusCode = computeStatusCode(event.rewriteStatusCode, cachedData.value.meta?.status);
                     const headers = {
                         ...cacheControl,
                         ...cachedData.value.meta?.headers,

package/dist/core/routing/middleware.js

@@ -101,13 +101,10 @@ export async function handleMiddleware(internalEvent, initialSearch, middlewareL
         else {
             if (filteredHeaders.includes(key.toLowerCase()))
                 return;
-            if (key.toLowerCase() === "set-cookie") {
-                resHeaders[key] = resHeaders[key]
-                    ? [...resHeaders[key], value]
-                    : [value];
-            }
-            else if (REDIRECTS.has(statusCode) &&
-                key.toLowerCase() === "location") {
+            // Headers.forEach folds same-name headers; use getSetCookie() below instead.
+            if (key.toLowerCase() === "set-cookie")
+                return;
+            if (REDIRECTS.has(statusCode) && key.toLowerCase() === "location") {
                 resHeaders[key] = normalizeLocationHeader(value, internalEvent.url);
             }
             else {
@@ -115,6 +112,10 @@ export async function handleMiddleware(internalEvent, initialSearch, middlewareL
             }
         }
     });
+    const setCookies = responseHeaders.getSetCookie();
+    if (setCookies.length > 0) {
+        resHeaders["set-cookie"] = setCookies;
+    }
     // If the middleware returned a Rewrite, set the `url` to the pathname of the rewrite
     // NOTE: the header was added to `req` from above
     const rewriteUrl = responseHeaders.get("x-middleware-rewrite");

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -56,7 +56,7 @@
     "@types/express": "5.0.0",
     "@types/node": "20.17.6",
     "concurrently": "^9.2.1",
-    "next": "16.3.3",
+    "next": "16.3.4",
     "tsc-alias": "^1.8.16",
     "typescript": "5.9.3"
   },