@opennextjs/aws 3.9.6 → 3.9.8

package/dist/adapters/composable-cache.d.ts

@@ -10,7 +10,15 @@ declare const _default: {
     } | undefined>;
     set(cacheKey: string, pendingEntry: Promise<ComposableCacheEntry>): Promise<void>;
     refreshTags(): Promise<void>;
-    getExpiration(...tags: string[]): Promise<number>;
+    /**
+     * The signature has changed in Next.js 16
+     * - Before Next.js 16, the method takes `...tags: string[]`
+     * - From Next.js 16, the method takes `tags: string[]`
+     */
+    getExpiration(...tags: string[] | string[][]): Promise<number>;
+    /**
+     * This method is only used before Next.js 16
+     */
     expireTags(...tags: string[]): Promise<void>;
     receiveExpiredTags(...tags: string[]): Promise<void>;
 };

package/dist/adapters/composable-cache.js

@@ -73,14 +73,23 @@ export default {
         // We don't do anything for now, do we want to do something here ???
         return;
     },
+    /**
+     * The signature has changed in Next.js 16
+     * - Before Next.js 16, the method takes `...tags: string[]`
+     * - From Next.js 16, the method takes `tags: string[]`
+     */
     async getExpiration(...tags) {
         if (globalThis.tagCache.mode === "nextMode") {
-            return globalThis.tagCache.getLastRevalidated(tags);
+            // Use `.flat()` to accommodate both signatures
+            return globalThis.tagCache.getLastRevalidated(tags.flat());
         }
         // We always return 0 here, original tag cache are handled directly in the get part
         // TODO: We need to test this more, i'm not entirely sure that this is working as expected
         return 0;
     },
+    /**
+     * This method is only used before Next.js 16
+     */
     async expireTags(...tags) {
         if (globalThis.tagCache.mode === "nextMode") {
             return writeTags(tags);

package/dist/build/copyTracedFiles.js

@@ -217,13 +217,19 @@ File ${serverPath} does not exist
     });
     readdirSync(standaloneNextDir)
         .filter((fileOrDir) => !statSync(path.join(standaloneNextDir, fileOrDir)).isDirectory())
-        .forEach((file) => copyFileSync(path.join(standaloneNextDir, file), path.join(outputNextDir, file)));
+        .forEach((file) => {
+        copyFileSync(path.join(standaloneNextDir, file), path.join(outputNextDir, file));
+        tracedFiles.push(path.join(outputNextDir, file));
+    });
     // We then need to copy all the files at the root of server
     mkdirSync(path.join(outputNextDir, "server"), { recursive: true });
     readdirSync(standaloneServerDir)
         .filter((fileOrDir) => !statSync(path.join(standaloneServerDir, fileOrDir)).isDirectory())
         .filter((file) => file !== "server.js")
-        .forEach((file) => copyFileSync(path.join(standaloneServerDir, file), path.join(path.join(outputNextDir, "server"), file)));
+        .forEach((file) => {
+        copyFileSync(path.join(standaloneServerDir, file), path.join(path.join(outputNextDir, "server"), file));
+        tracedFiles.push(path.join(outputNextDir, "server", file));
+    });
     // Copy patch file
     copyPatchFile(path.join(outputDir, packagePath));
     // TODO: Recompute all the files.

package/dist/build/createServerBundle.js

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

package/dist/build/installDeps.js

@@ -3,7 +3,6 @@ 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,28 +36,27 @@ export function installDependencies(outputDir, installOptions) {
         });
         // Copy the node_modules to the outputDir
         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.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)) {
-                const symlinkPath = path.join(tempBinDir, fileName);
-                const stat = fs.lstatSync(symlinkPath);
-                if (stat.isSymbolicLink()) {
-                    const linkTarget = fs.readlinkSync(symlinkPath);
-                    const realFilePath = path.resolve(tempBinDir, linkTarget);
-                    const outputFilePath = path.join(outputBinDir, fileName);
-                    if (fs.existsSync(outputFilePath)) {
-                        fs.unlinkSync(outputFilePath);
-                    }
-                    fs.copyFileSync(realFilePath, outputFilePath);
-                    fs.chmodSync(outputFilePath, "755");
-                    logger.debug(`Replaced symlink ${fileName} with actual file`);
+        // This is a workaround for all Node versions. It seems to be an issue continue to affect new versions aswell.
+        // Therefor I think the most logical solution is to always run this workaround instead of trying to figure out which versions are affected.
+        const tempBinDir = path.join(tempInstallDir, "node_modules", ".bin");
+        const outputBinDir = path.join(outputDir, "node_modules", ".bin");
+        for (const fileName of fs.readdirSync(tempBinDir)) {
+            const symlinkPath = path.join(tempBinDir, fileName);
+            const stat = fs.lstatSync(symlinkPath);
+            if (stat.isSymbolicLink()) {
+                const linkTarget = fs.readlinkSync(symlinkPath);
+                const realFilePath = path.resolve(tempBinDir, linkTarget);
+                const outputFilePath = path.join(outputBinDir, fileName);
+                if (fs.existsSync(outputFilePath)) {
+                    fs.unlinkSync(outputFilePath);
                 }
+                fs.copyFileSync(realFilePath, outputFilePath);
+                fs.chmodSync(outputFilePath, "755");
+                logger.debug(`Replaced symlink ${fileName} with actual file`);
             }
         }
+        // End of Node Workaround
         // Cleanup tempDir
         fs.rmSync(tempInstallDir, { recursive: true, force: true });
         logger.info(`Dependencies installed for ${name}`);

package/dist/build/patch/codePatcher.d.ts

@@ -26,6 +26,10 @@ export type PatchCodeFn = (args: {
      * Next.js manifests that are used by Next at runtime
      */
     manifests: ReturnType<typeof getManifests>;
+    /**
+     * OpenNext build options
+     */
+    buildOptions: buildHelper.BuildOptions;
 }) => Promise<string>;
 interface IndividualPatch {
     pathFilter: RegExp;

package/dist/build/patch/codePatcher.js

@@ -94,6 +94,7 @@ export async function applyCodePatches(buildOptions, tracedFiles, manifests, cod
                 filePath,
                 tracedFiles,
                 manifests,
+                buildOptions,
             });
         }
         await fs.writeFile(filePath, patchedContent);

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

@@ -4,3 +4,4 @@ export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, }
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";
 export { patchBackgroundRevalidation } from "./patchBackgroundRevalidation.js";
 export { patchNodeEnvironment } from "./patchNodeEnvironment.js";
+export { patchNextConfig } from "./patchNextConfig.js";

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

@@ -4,3 +4,4 @@ export { patchFetchCacheForISR, patchUnstableCacheForISR, patchUseCacheForISR, }
 export { patchFetchCacheSetMissingWaitUntil } from "./patchFetchCacheWaitUntil.js";
 export { patchBackgroundRevalidation } from "./patchBackgroundRevalidation.js";
 export { patchNodeEnvironment } from "./patchNodeEnvironment.js";
+export { patchNextConfig } from "./patchNextConfig.js";

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

@@ -0,0 +1,2 @@
+import type { CodePatcher } from "../codePatcher";
+export declare const patchNextConfig: CodePatcher;

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

@@ -0,0 +1,54 @@
+import fs from "node:fs";
+import path from "node:path";
+import { buildSync } from "esbuild";
+export const patchNextConfig = {
+    name: "patch-next-config",
+    patches: [
+        {
+            pathFilter: /required\-server\-files\.json$/,
+            versions: ">=16.1.0",
+            patchCode: async ({ code, buildOptions }) => {
+                // Find the next.config file with any supported extension
+                const tsExtensions = [".ts", ".mts", ".cts"];
+                const possibleExtensions = [...tsExtensions, ".mjs", ".js", ".cjs"];
+                let configPath;
+                let configExtension;
+                for (const ext of possibleExtensions) {
+                    const testPath = path.join(buildOptions.appPath, `next.config${ext}`);
+                    if (fs.existsSync(testPath)) {
+                        configPath = testPath;
+                        configExtension = ext;
+                        break;
+                    }
+                }
+                if (!configPath || !configExtension) {
+                    throw new Error("Could not find next.config file");
+                }
+                let configToImport;
+                // Only compile if the extension is a TypeScript extension
+                if (tsExtensions.includes(configExtension)) {
+                    buildSync({
+                        entryPoints: [configPath],
+                        outfile: path.join(buildOptions.tempBuildDir, "next.config.mjs"),
+                        bundle: true,
+                        format: "esm",
+                        platform: "node",
+                    });
+                    configToImport = path.join(buildOptions.tempBuildDir, "next.config.mjs");
+                }
+                else {
+                    // For .js, .mjs, .cjs, use the file directly
+                    configToImport = configPath;
+                }
+                // In next 16.1+ we need to add `skipTrailingSlashRedirect` manually because next removes it from the config
+                const originalConfig = (await import(configToImport)).default;
+                const config = JSON.parse(code);
+                if (config.config.skipTrailingSlashRedirect === undefined) {
+                    config.config.skipTrailingSlashRedirect =
+                        originalConfig.skipTrailingSlashRedirect ?? false;
+                }
+                return JSON.stringify(config, null, 2);
+            },
+        },
+    ],
+};

package/dist/types/cache.d.ts

@@ -126,7 +126,13 @@ export interface ComposableCacheHandler {
     get(cacheKey: string): Promise<ComposableCacheEntry | undefined>;
     set(cacheKey: string, pendingEntry: Promise<ComposableCacheEntry>): Promise<void>;
     refreshTags(): Promise<void>;
-    getExpiration(...tags: string[]): Promise<number>;
+    /**
+     * Next 16 takes an array of tags instead of variadic arguments
+     */
+    getExpiration(...tags: string[] | string[][]): Promise<number>;
+    /**
+     * Removed from Next.js 16
+     */
     expireTags(...tags: string[]): Promise<void>;
     /**
      * This function is only there for older versions and do nothing

package/package.json

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