@opennextjs/aws 3.7.4 → 3.7.5

package/dist/build/copyTracedFiles.js

@@ -13,6 +13,10 @@ const EXCLUDED_PACKAGES = [
     // This seems to be only in Next 15
     // Some of sharp deps are under the @img scope
     "@img",
+    "typescript",
+    "next/dist/compiled/babel",
+    "next/dist/compiled/babel-packages",
+    "next/dist/compiled/amphtml-validator",
 ];
 function isExcluded(srcPath) {
     return EXCLUDED_PACKAGES.some((excluded) => srcPath.match(getCrossPlatformPathRegex(`/node_modules/${excluded}/`)));
@@ -167,7 +171,7 @@ File ${serverPath} does not exist
     const tracedFiles = [];
     //Actually copy the files
     filesToCopy.forEach((to, from) => {
-        // We don't want to copy excluded packages (i.e sharp)
+        // We don't want to copy excluded packages (e.g. sharp)
         if (isExcluded(from)) {
             return;
         }

package/dist/build/createServerBundle.js

@@ -126,6 +126,7 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         patches.patchEnvVars,
         patches.patchBackgroundRevalidation,
         patches.patchUseCacheForISR,
+        patches.patchNodeEnvironment,
         ...additionalCodePatches,
     ]);
     // Build Lambda code

package/dist/build/installDeps.js

@@ -3,6 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { execSync } from "node:child_process";
 import logger from "../logger.js";
+const AFFECTED_NODE_VERSIONS = ["22.17.0", "22.17.1", "22.18.0"];
 export function installDependencies(outputDir, installOptions) {
     try {
         if (!installOptions) {
@@ -37,8 +38,8 @@ export function installDependencies(outputDir, installOptions) {
         fs.cpSync(path.join(tempInstallDir, "node_modules"), path.join(outputDir, "node_modules"), { recursive: true, force: true, dereference: true });
         // This is a workaround for Node `22.17.0` and `22.17.1`
         // https://github.com/nodejs/node/issues/59168
-        const nodeVersion = process.version;
-        if (nodeVersion === "v22.17.0" || nodeVersion === "v22.17.1") {
+        const nodeVersion = process.versions.node;
+        if (AFFECTED_NODE_VERSIONS.includes(nodeVersion)) {
             const tempBinDir = path.join(tempInstallDir, "node_modules", ".bin");
             const outputBinDir = path.join(outputDir, "node_modules", ".bin");
             for (const fileName of fs.readdirSync(tempBinDir)) {

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 { patchNodeEnvironment } from "./patchNodeEnvironment.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 { patchNodeEnvironment } from "./patchNodeEnvironment.js";

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

@@ -8,8 +8,4 @@ export declare const removeMiddlewareManifestRule = "\nrule:\n  kind: statement_
  * @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";
 export declare const patchNextServer: CodePatcher;

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

@@ -48,16 +48,6 @@ fix: |-
   }
 `;
 }
-/**
- * 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");
-`;
 const pathFilter = getCrossPlatformPathRegex(String.raw `/next/dist/server/next-server\.js$`, {
     escape: false,
 });
@@ -81,12 +71,6 @@ const babelPatches = [
         contentFilter: /runEdgeFunction\(/,
         patchCode: createPatchCode(createEmptyBodyRule("runEdgeFunction")),
     },
-    // Drop `error-inspect` that pulls babel
-    {
-        pathFilter,
-        contentFilter: /error-inspect/,
-        patchCode: createPatchCode(errorInspectRule),
-    },
 ];
 export const patchNextServer = {
     name: "patch-next-server",

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

@@ -0,0 +1,8 @@
+import type { CodePatcher } from "../codePatcher.js";
+/**
+ * Drops `require("./node-environment-extensions/error-inspect");`
+ *
+ * This is to avoid pulling babel (~4MB)
+ */
+export declare const rule = "\nrule:\n  pattern: require(\"./node-environment-extensions/error-inspect\");\nfix: |-\n  // Removed by OpenNext\n  // require(\"./node-environment-extensions/error-inspect\");\n";
+export declare const patchNodeEnvironment: CodePatcher;

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

@@ -0,0 +1,27 @@
+import { getCrossPlatformPathRegex } from "../../../utils/regex.js";
+import { createPatchCode } from "../astCodePatcher.js";
+/**
+ * Drops `require("./node-environment-extensions/error-inspect");`
+ *
+ * This is to avoid pulling babel (~4MB)
+ */
+export const rule = `
+rule:
+  pattern: require("./node-environment-extensions/error-inspect");
+fix: |-
+  // Removed by OpenNext
+  // require("./node-environment-extensions/error-inspect");
+`;
+export const patchNodeEnvironment = {
+    name: "patch-node-environment-error-inspect",
+    patches: [
+        {
+            pathFilter: getCrossPlatformPathRegex(String.raw `/next/dist/server/node-environment\.js$`, {
+                escape: false,
+            }),
+            contentFilter: /error-inspect/,
+            patchCode: createPatchCode(rule),
+            versions: ">=15.0.0",
+        },
+    ],
+};

package/dist/build.js

@@ -28,10 +28,10 @@ export async function build(openNextConfigPath, nodeExternals) {
     // Build Next.js app
     printHeader("Building Next.js app");
     setStandaloneBuildMode(options);
+    buildHelper.initOutputDir(options);
     buildNextjsApp(options);
     // Generate deployable bundle
     printHeader("Generating bundle");
-    buildHelper.initOutputDir(options);
     // Compile cache.ts
     compileCache(options);
     // Compile middleware

package/dist/core/routing/cacheInterceptor.js

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import { NextConfig, PrerenderManifest } from "../../adapters/config/index";
 import { emptyReadableStream, toReadableStream } from "../../utils/stream";
+import { isBinaryContentType } from "../../utils/binary";
 import { getTagsFromValue, hasBeenRevalidated } from "../../utils/cache";
 import { debug } from "../../adapters/logger";
 import { localizePath } from "./i18n";
@@ -200,6 +201,21 @@ export async function cacheInterceptor(event) {
                         isBase64Encoded: false,
                     };
                 }
+                case "route": {
+                    const cacheControl = await computeCacheControl(localizedPath, cachedData.value.body, host, cachedData.value.revalidate, cachedData.lastModified);
+                    const isBinary = isBinaryContentType(String(cachedData.value.meta?.headers?.["content-type"]));
+                    return {
+                        type: "core",
+                        statusCode: cachedData.value.meta?.status ?? 200,
+                        body: toReadableStream(cachedData.value.body, isBinary),
+                        headers: {
+                            ...cacheControl,
+                            ...cachedData.value.meta?.headers,
+                            vary: VARY_HEADER,
+                        },
+                        isBase64Encoded: isBinary,
+                    };
+                }
                 default:
                     return event;
             }

package/dist/http/openNextResponse.js

@@ -65,6 +65,12 @@ export class OpenNextNodeResponse extends Transform {
             statusCode <= 599) {
             this.statusCode = statusCode;
         }
+        // https://github.com/vercel/next.js/blob/ea08bf2/packages/next/src/server/web/spec-extension/adapters/next-request.ts#L46-L54
+        // We want to destroy this response when the original response/request is closed. (i.e when the client disconnects)
+        // This is to support `request.signal.onabort` in route handlers
+        streamCreator?.abortSignal?.addEventListener("abort", () => {
+            this.destroy();
+        });
     }
     // Necessary for next 12
     // We might have to implement all the methods here

package/dist/overrides/wrappers/cloudflare-node.js

@@ -1,7 +1,7 @@
 import { Writable } from "node:stream";
 // Response with null body status (101, 204, 205, or 304) cannot have a body.
 const NULL_BODY_STATUSES = new Set([101, 204, 205, 304]);
-const handler = async (handler, converter) => async (request, env, ctx) => {
+const handler = async (handler, converter) => async (request, env, ctx, abortSignal) => {
     globalThis.process = process;
     // Set the environment variables
     // Cloudflare suggests to not override the process.env object but instead apply the values to it
@@ -38,6 +38,10 @@ const handler = async (handler, converter) => async (request, env, ctx) => {
             resolveResponse(response);
             return Writable.fromWeb(writable);
         },
+        // This is for passing along the original abort signal from the initial Request you retrieve in your worker
+        // Ensures that the response we pass to NextServer is aborted if the request is aborted
+        // By doing this `request.signal.onabort` will work in route handlers
+        abortSignal: abortSignal,
     };
     ctx.waitUntil(handler(internalEvent, {
         streamCreator,

package/dist/overrides/wrappers/express-dev.js

@@ -27,6 +27,7 @@ const wrapper = async (handler, converter) => {
             req.headers["x-forwarded-proto"] = req.protocol;
         }
         const internalEvent = await converter.convertFrom(req);
+        const abortController = new AbortController();
         const streamCreator = {
             writeHeaders: (prelude) => {
                 res.setHeader("Set-Cookie", prelude.cookies);
@@ -35,7 +36,11 @@ const wrapper = async (handler, converter) => {
                 return res;
             },
             onFinish: () => { },
+            abortSignal: abortController.signal,
         };
+        res.on("close", () => {
+            abortController.abort();
+        });
         await handler(internalEvent, { streamCreator });
     });
     const server = app.listen(Number.parseInt(process.env.PORT ?? "3000", 10), () => {

package/dist/overrides/wrappers/node.js

@@ -3,6 +3,7 @@ import { debug, error } from "../../adapters/logger";
 const wrapper = async (handler, converter) => {
     const server = createServer(async (req, res) => {
         const internalEvent = await converter.convertFrom(req);
+        const abortController = new AbortController();
         const streamCreator = {
             writeHeaders: (prelude) => {
                 res.setHeader("Set-Cookie", prelude.cookies);
@@ -10,7 +11,11 @@ const wrapper = async (handler, converter) => {
                 res.flushHeaders();
                 return res;
             },
+            abortSignal: abortController.signal,
         };
+        res.on("close", () => {
+            abortController.abort();
+        });
         if (internalEvent.rawPath === "/__health") {
             res.writeHead(200, {
                 "Content-Type": "text/plain",
@@ -18,7 +23,9 @@ const wrapper = async (handler, converter) => {
             res.end("OK");
         }
         else {
-            await handler(internalEvent, { streamCreator });
+            await handler(internalEvent, {
+                streamCreator,
+            });
         }
     });
     await new Promise((resolve) => {

package/dist/types/open-next.d.ts

@@ -30,6 +30,7 @@ export interface StreamCreator {
     }): Writable;
     onWrite?: () => void;
     onFinish?: (length: number) => void;
+    abortSignal?: AbortSignal;
 }
 export type WaitUntil = (promise: Promise<void>) => void;
 export interface DangerousOptions {

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.7.4",
+  "version": "3.7.5",
   "bin": {
     "open-next": "./dist/index.js"
   },