@opennextjs/aws 3.6.4 → 3.6.5

package/dist/build/createServerBundle.js

@@ -14,7 +14,7 @@ import { copyMiddlewareResources, generateEdgeBundle, } from "./edge/createEdgeB
 import * as buildHelper from "./helper.js";
 import { installDependencies } from "./installDeps.js";
 import { applyCodePatches } from "./patch/codePatcher.js";
-import { patchBackgroundRevalidation, patchEnvVars, patchFetchCacheForISR, patchFetchCacheSetMissingWaitUntil, patchNextServer, patchUnstableCacheForISR, patchUseCacheForISR, } from "./patch/patches/index.js";
+import * as patches from "./patch/patches/index.js";
 export async function createServerBundle(options, codeCustomization) {
     const { config } = options;
     const foundRoutes = new Set();
@@ -119,13 +119,14 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
     });
     const additionalCodePatches = codeCustomization?.additionalCodePatches ?? [];
     await applyCodePatches(options, tracedFiles, manifests, [
-        patchFetchCacheSetMissingWaitUntil,
-        patchFetchCacheForISR,
-        patchUnstableCacheForISR,
-        patchNextServer,
-        patchEnvVars,
-        patchBackgroundRevalidation,
-        patchUseCacheForISR,
+        patches.patchFetchCacheSetMissingWaitUntil,
+        patches.patchFetchCacheForISR,
+        patches.patchUnstableCacheForISR,
+        patches.patchNextServer,
+        patches.patchEnvVars,
+        patches.patchBackgroundRevalidation,
+        patches.patchUseCacheForISR,
+        patches.patchDropBabel,
         ...additionalCodePatches,
     ]);
     // Build Lambda code

package/dist/build/patch/patches/dropBabel.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Patches to avoid pulling babel (~4MB).
+ *
+ * Details:
+ * - empty `NextServer#runMiddleware` and `NextServer#runEdgeFunction` that are not used
+ * - drop `next/dist/server/node-environment-extensions/error-inspect.js`
+ */
+import type { CodePatcher } from "../codePatcher.js";
+export declare const patchDropBabel: CodePatcher;
+/**
+ * Swaps the body for a throwing implementation
+ *
+ * @param methodName The name of the method
+ * @returns A rule to replace the body with a `throw`
+ */
+export declare function createEmptyBodyRule(methodName: string): string;
+/**
+ * Drops `require("./node-environment-extensions/error-inspect");`
+ */
+export declare const errorInspectRule = "\nrule:\n  pattern: require(\"./node-environment-extensions/error-inspect\");\nfix: |-\n  // Removed by OpenNext\n  // require(\"./node-environment-extensions/error-inspect\");\n";

package/dist/build/patch/patches/dropBabel.js

@@ -0,0 +1,72 @@
+/**
+ * Patches to avoid pulling babel (~4MB).
+ *
+ * Details:
+ * - empty `NextServer#runMiddleware` and `NextServer#runEdgeFunction` that are not used
+ * - drop `next/dist/server/node-environment-extensions/error-inspect.js`
+ */
+import { getCrossPlatformPathRegex } from "../../../utils/regex.js";
+import { patchCode } from "../astCodePatcher.js";
+export const patchDropBabel = {
+    name: "patch-drop-babel",
+    patches: [
+        // Empty the body of `NextServer#runMiddleware`
+        {
+            field: {
+                pathFilter: getCrossPlatformPathRegex(String.raw `/next/dist/server/next-server\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /runMiddleware\(/,
+                patchCode: async ({ code }) => patchCode(code, createEmptyBodyRule("runMiddleware")),
+            },
+        },
+        // Empty the body of `NextServer#runEdgeFunction`
+        {
+            field: {
+                pathFilter: getCrossPlatformPathRegex(String.raw `/next/dist/server/next-server\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /runEdgeFunction\(/,
+                patchCode: async ({ code }) => patchCode(code, createEmptyBodyRule("runEdgeFunction")),
+            },
+        },
+        // Drop `error-inspect` that pulls babel
+        {
+            field: {
+                pathFilter: getCrossPlatformPathRegex(String.raw `next/dist/server/node-environment\.js$`, {
+                    escape: false,
+                }),
+                contentFilter: /error-inspect/,
+                patchCode: async ({ code }) => patchCode(code, errorInspectRule),
+            },
+        },
+    ],
+};
+/**
+ * Swaps the body for a throwing implementation
+ *
+ * @param methodName The name of the method
+ * @returns A rule to replace the body with a `throw`
+ */
+export function createEmptyBodyRule(methodName) {
+    return `
+rule:
+  pattern:
+    selector: method_definition
+    context: "class { async ${methodName}($$$PARAMS) { $$$_ } }"
+fix: |-
+  async ${methodName}($$$PARAMS) {
+    throw new Error("${methodName} should not be called with OpenNext");
+  }
+`;
+}
+/**
+ * Drops `require("./node-environment-extensions/error-inspect");`
+ */
+export const errorInspectRule = `
+rule:
+  pattern: require("./node-environment-extensions/error-inspect");
+fix: |-
+  // Removed by OpenNext
+  // require("./node-environment-extensions/error-inspect");
+`;

package/dist/build/patch/patches/index.d.ts

@@ -3,3 +3,4 @@ export { patchNextServer } from "./patchNextServer.js";
 export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, } from "./patchFetchCacheISR.js";
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";
 export { patchBackgroundRevalidation } from "./patchBackgroundRevalidation.js";
+export { patchDropBabel } from "./dropBabel.js";

package/dist/build/patch/patches/index.js

@@ -3,3 +3,4 @@ export { patchNextServer } from "./patchNextServer.js";
 export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, } from "./patchFetchCacheISR.js";
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";
 export { patchBackgroundRevalidation } from "./patchBackgroundRevalidation.js";
+export { patchDropBabel } from "./dropBabel.js";

package/dist/http/openNextResponse.js

@@ -1,6 +1,6 @@
 import { Transform } from "node:stream";
 import { debug } from "../adapters/logger";
-import { parseCookies, parseHeaders } from "./util";
+import { parseHeaders, parseSetCookieHeader } from "./util";
 const SET_COOKIE_HEADER = "set-cookie";
 const CANNOT_BE_USED = "This cannot be used in OpenNext";
 // We only need to implement the methods that are used by next.js
@@ -127,7 +127,7 @@ export class OpenNextNodeResponse extends Transform {
                         ...this.initialHeaders,
                         ...this.headers,
                     };
-            const initialCookies = parseCookies(this.initialHeaders[SET_COOKIE_HEADER]?.toString());
+            const initialCookies = parseSetCookieHeader(this.initialHeaders[SET_COOKIE_HEADER]?.toString());
             this._cookies =
                 mergeHeadersPriority === "middleware"
                     ? [...this._cookies, ...initialCookies]

package/dist/http/util.d.ts

@@ -1,7 +1,13 @@
 import type http from "node:http";
 export declare const parseHeaders: (headers?: http.OutgoingHttpHeader[] | http.OutgoingHttpHeaders) => Record<string, string>;
 export declare const convertHeader: (header: http.OutgoingHttpHeader) => string;
-export declare function parseCookies(cookies: string | string[] | null | undefined): string[];
+/**
+ * Parses a (comma-separated) list of Set-Cookie headers
+ *
+ * @param cookies A comma-separated list of Set-Cookie headers or a list of Set-Cookie headers
+ * @returns A list of Set-Cookie header
+ */
+export declare function parseSetCookieHeader(cookies: string | string[] | null | undefined): string[];
 /**
  *
  * Get the query object from an iterable of [key, value] pairs

package/dist/http/util.js

@@ -20,13 +20,23 @@ export const convertHeader = (header) => {
     }
     return String(header);
 };
-export function parseCookies(cookies) {
+/**
+ * Parses a (comma-separated) list of Set-Cookie headers
+ *
+ * @param cookies A comma-separated list of Set-Cookie headers or a list of Set-Cookie headers
+ * @returns A list of Set-Cookie header
+ */
+export function parseSetCookieHeader(cookies) {
     if (!cookies) {
         return [];
     }
-    return typeof cookies === "string"
-        ? cookies.split(/(?<!Expires=\w+),/i).map((c) => c.trim())
-        : cookies;
+    if (typeof cookies === "string") {
+        // Split the cookie string on ",".
+        // Note that "," can also appear in the Expires value (i.e. `Expires=Thu, 01 June`)
+        // so we have to skip it with a negative lookbehind.
+        return cookies.split(/(?<!Expires=\w+),/i).map((c) => c.trim());
+    }
+    return cookies;
 }
 /**
  *

package/dist/overrides/converters/aws-apigw-v2.js

@@ -1,4 +1,4 @@
-import { parseCookies } from "../../http/util";
+import { parseSetCookieHeader } from "../../http/util";
 import { fromReadableStream } from "../../utils/stream";
 import { debug } from "../../adapters/logger";
 import { convertToQuery } from "../../core/routing/util";
@@ -87,7 +87,7 @@ async function convertToApiGatewayProxyResultV2(result) {
     const response = {
         statusCode: result.statusCode,
         headers,
-        cookies: parseCookies(result.headers["set-cookie"]),
+        cookies: parseSetCookieHeader(result.headers["set-cookie"]),
         body,
         isBase64Encoded: result.isBase64Encoded,
     };

package/dist/overrides/converters/aws-cloudfront.js

@@ -1,4 +1,4 @@
-import { parseCookies } from "../../http/util";
+import { parseSetCookieHeader } from "../../http/util";
 import { fromReadableStream } from "../../utils/stream";
 import { debug } from "../../adapters/logger";
 import { convertToQuery, convertToQueryString } from "../../core/routing/util";
@@ -84,7 +84,7 @@ function convertToCloudfrontHeaders(headers, directResponse) {
         (directResponse ? !cloudfrontReadOnlyHeaders.includes(key) : true))
         .forEach(([key, value]) => {
         if (key === "set-cookie") {
-            cloudfrontHeaders[key] = parseCookies(`${value}`).map((cookie) => ({
+            cloudfrontHeaders[key] = parseSetCookieHeader(`${value}`).map((cookie) => ({
                 key,
                 value: cookie,
             }));

package/dist/overrides/converters/edge.js

@@ -1,5 +1,6 @@
 import { Buffer } from "node:buffer";
-import { parseCookies } from "../../http/util";
+import cookieParser from "cookie";
+import { parseSetCookieHeader } from "../../http/util";
 import { getQueryFromSearchParams } from "./utils.js";
 const converter = {
     convertFrom: async (event) => {
@@ -15,7 +16,10 @@ const converter = {
         const rawPath = url.pathname;
         const method = event.method;
         const shouldHaveBody = method !== "GET" && method !== "HEAD";
-        const cookies = Object.fromEntries(parseCookies(event.headers.get("cookie")).map((cookie) => cookie.split("=")));
+        const cookieHeader = event.headers.get("cookie");
+        const cookies = cookieHeader
+            ? cookieParser.parse(cookieHeader)
+            : {};
         return {
             type: "core",
             method,
@@ -58,7 +62,7 @@ const converter = {
             if (key === "set-cookie" && typeof value === "string") {
                 // If the value is a string, we need to parse it into an array
                 // This is the case for middleware direct result
-                const cookies = parseCookies(value);
+                const cookies = parseSetCookieHeader(value);
                 for (const cookie of cookies) {
                     headers.append(key, cookie);
                 }

package/dist/overrides/converters/node.js

@@ -1,4 +1,4 @@
-import { parseCookies } from "../../http/util";
+import cookieParser from "cookie";
 import { extractHostFromHeaders, getQueryFromSearchParams } from "./utils.js";
 const converter = {
     convertFrom: async (req) => {
@@ -20,6 +20,10 @@ const converter = {
         // https://nodejs.org/api/http.html#messageurl
         const url = new URL(`${req.protocol ? req.protocol : "http"}://${extractHostFromHeaders(headers)}${req.url}`);
         const query = getQueryFromSearchParams(url.searchParams);
+        const cookieHeader = req.headers.cookie;
+        const cookies = cookieHeader
+            ? cookieParser.parse(cookieHeader)
+            : {};
         return {
             type: "core",
             method: req.method ?? "GET",
@@ -31,10 +35,7 @@ const converter = {
                 req.socket.remoteAddress ??
                 "::1",
             query,
-            cookies: Object.fromEntries(parseCookies(req.headers.cookie)?.map((cookie) => {
-                const [key, value] = cookie.split("=");
-                return [key, value];
-            }) ?? []),
+            cookies,
         };
     },
     // Nothing to do here, it's streaming

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -44,6 +44,7 @@
     "@tsconfig/node18": "^1.0.1",
     "aws4fetch": "^1.0.18",
     "chalk": "^5.3.0",
+    "cookie": "^1.0.2",
     "esbuild": "0.25.4",
     "express": "5.0.1",
     "path-to-regexp": "^6.3.0",