@opennextjs/aws 4.0.0 → 4.0.1

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.1",
   "bin": {
     "open-next": "./dist/index.js"
   },