@opennextjs/aws 3.9.14 → 3.9.16

package/dist/adapters/cache.js

@@ -209,7 +209,13 @@ export default class Cache {
                         break;
                     }
                     case "APP_PAGE": {
-                        const { html, rscData, headers, status } = data;
+                        const { html, rscData, headers, status, segmentData, postponed } = data;
+                        const segmentToWrite = {};
+                        if (segmentData) {
+                            for (const [segmentPath, segmentContent,] of segmentData.entries()) {
+                                segmentToWrite[segmentPath] = segmentContent.toString("utf8");
+                            }
+                        }
                         await globalThis.incrementalCache.set(key, {
                             type: "app",
                             html,
@@ -217,8 +223,10 @@ export default class Cache {
                             meta: {
                                 status,
                                 headers,
+                                postponed,
                             },
                             revalidate,
+                            segmentData: segmentData ? segmentToWrite : undefined,
                         }, "cache");
                         break;
                     }

package/dist/build/copyTracedFiles.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Copies a file and ensures the destination is writable.
+ * This is necessary because copyFileSync preserves file permissions,
+ * and source files may be read-only (e.g., in Bazel's node_modules).
+ * Without this, subsequent patches would fail with EACCES errors.
+ */
+export declare function copyFileAndMakeOwnerWritable(src: string, dest: string): void;
 export declare function isExcluded(srcPath: string): boolean;
 interface CopyTracedFilesOptions {
     buildOutputPath: string;

package/dist/build/copyTracedFiles.js

@@ -1,11 +1,25 @@
 import url from "node:url";
-import { copyFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, readlinkSync, statSync, symlinkSync, writeFileSync, } from "node:fs";
+import { chmodSync, copyFileSync, cpSync, existsSync, mkdirSync, readFileSync, readdirSync, readlinkSync, statSync, symlinkSync, writeFileSync, } from "node:fs";
 import path from "node:path";
 import { loadAppPathsManifest, loadBuildId, loadConfig, loadFunctionsConfigManifest, loadMiddlewareManifest, loadPagesManifest, loadPrerenderManifest, } from "../adapters/config/util.js";
 import { getCrossPlatformPathRegex } from "../utils/regex.js";
 import logger from "../logger.js";
 import { INSTRUMENTATION_TRACE_FILE, MIDDLEWARE_TRACE_FILE, } from "./constant.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+/**
+ * Copies a file and ensures the destination is writable.
+ * This is necessary because copyFileSync preserves file permissions,
+ * and source files may be read-only (e.g., in Bazel's node_modules).
+ * Without this, subsequent patches would fail with EACCES errors.
+ */
+export function copyFileAndMakeOwnerWritable(src, dest) {
+    copyFileSync(src, dest);
+    // Ensure the copied file is writable (add owner write permission)
+    const stats = statSync(dest);
+    if (!(stats.mode & 0o200)) {
+        chmodSync(dest, stats.mode | 0o200);
+    }
+}
 //TODO: we need to figure which packages we could safely remove
 const EXCLUDED_PACKAGES = [
     "caniuse-lite",
@@ -29,7 +43,7 @@ export function isExcluded(srcPath) {
 function copyPatchFile(outputDir) {
     const patchFile = path.join(__dirname, "patch", "patchedAsyncStorage.js");
     const outputPatchFile = path.join(outputDir, "patchedAsyncStorage.cjs");
-    copyFileSync(patchFile, outputPatchFile);
+    copyFileAndMakeOwnerWritable(patchFile, outputPatchFile);
 }
 export function getManifests(nextDir) {
     return {
@@ -138,13 +152,13 @@ File ${serverPath} does not exist
     // Check for instrumentation trace file
     if (existsSync(path.join(dotNextDir, INSTRUMENTATION_TRACE_FILE))) {
         // We still need to copy the nft.json file so that computeCopyFilesForPage doesn't throw
-        copyFileSync(path.join(dotNextDir, INSTRUMENTATION_TRACE_FILE), path.join(standaloneNextDir, INSTRUMENTATION_TRACE_FILE));
+        copyFileAndMakeOwnerWritable(path.join(dotNextDir, INSTRUMENTATION_TRACE_FILE), path.join(standaloneNextDir, INSTRUMENTATION_TRACE_FILE));
         computeCopyFilesForPage("instrumentation");
         logger.debug("Adding instrumentation trace files");
     }
     if (existsSync(path.join(dotNextDir, MIDDLEWARE_TRACE_FILE))) {
         // We still need to copy the nft.json file so that computeCopyFilesForPage doesn't throw
-        copyFileSync(path.join(dotNextDir, MIDDLEWARE_TRACE_FILE), path.join(standaloneNextDir, MIDDLEWARE_TRACE_FILE));
+        copyFileAndMakeOwnerWritable(path.join(dotNextDir, MIDDLEWARE_TRACE_FILE), path.join(standaloneNextDir, MIDDLEWARE_TRACE_FILE));
         computeCopyFilesForPage("middleware");
         logger.debug("Adding node middleware trace files");
     }
@@ -207,7 +221,7 @@ File ${serverPath} does not exist
             // where some files listed in the .nft.json might not be present in the standalone folder
             // TODO: investigate that further - is it expected?
             try {
-                copyFileSync(from, to);
+                copyFileAndMakeOwnerWritable(from, to);
             }
             catch (e) {
                 logger.debug("Error copying file:", e);
@@ -218,7 +232,7 @@ 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));
+        copyFileAndMakeOwnerWritable(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
@@ -227,7 +241,7 @@ File ${serverPath} does not exist
         .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));
+        copyFileAndMakeOwnerWritable(path.join(standaloneServerDir, file), path.join(path.join(outputNextDir, "server"), file));
         tracedFiles.push(path.join(outputNextDir, "server", file));
     });
     // Copy patch file
@@ -245,7 +259,7 @@ File ${serverPath} does not exist
             mkdirSync(path.dirname(path.join(outputNextDir, filePath)), {
                 recursive: true,
             });
-            copyFileSync(path.join(standaloneNextDir, filePath), path.join(outputNextDir, filePath));
+            copyFileAndMakeOwnerWritable(path.join(standaloneNextDir, filePath), path.join(outputNextDir, filePath));
         }
     };
     const manifests = getManifests(standaloneNextDir);

package/dist/build/helper.d.ts

@@ -95,9 +95,12 @@ export declare function copyEnvFile(appPath: string, packagePath: string, output
  * Finds the path to the Next configuration file if it exists.
  *
  * @param appPath The directory to check for the Next config file
- * @returns The full path to Next config file if it exists, undefined otherwise
+ * @returns An object with the full path to Next config file alongside a flag indicating whether the file is in typescript if it exists, undefined otherwise
  */
-export declare function findNextConfig({ appPath, }: Pick<BuildOptions, "appPath">): string | undefined;
+export declare function findNextConfig({ appPath, }: Pick<BuildOptions, "appPath">): {
+    path: string;
+    isTypescript: boolean;
+} | undefined;
 /**
  * Check we are in a Nextjs app by looking for the Nextjs config file.
  */

package/dist/build/helper.js

@@ -352,10 +352,26 @@ export function copyEnvFile(appPath, packagePath, outputPath) {
  * Finds the path to the Next configuration file if it exists.
  *
  * @param appPath The directory to check for the Next config file
- * @returns The full path to Next config file if it exists, undefined otherwise
+ * @returns An object with the full path to Next config file alongside a flag indicating whether the file is in typescript if it exists, undefined otherwise
  */
 export function findNextConfig({ appPath, }) {
-    return ["js", "cjs", "mjs", "ts"].find((ext) => fs.existsSync(path.join(appPath, `next.config.${ext}`)));
+    const extensions = [
+        { ext: "ts", isTypescript: true },
+        { ext: "mts", isTypescript: true },
+        { ext: "cts", isTypescript: true },
+        { ext: "js", isTypescript: false },
+        { ext: "mjs", isTypescript: false },
+        { ext: "cjs", isTypescript: false },
+    ];
+    for (const { ext, isTypescript } of extensions) {
+        const configPath = path.join(appPath, `next.config.${ext}`);
+        if (fs.existsSync(configPath)) {
+            return {
+                path: configPath,
+                isTypescript,
+            };
+        }
+    }
 }
 /**
  * Check we are in a Nextjs app by looking for the Nextjs config file.

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

@@ -45,25 +45,14 @@ export async function patchOriginalNextConfig(options) {
  * @returns
  */
 async function importNextConfigFromSource(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) {
+    const nextConfigDetails = buildHelper.findNextConfig(buildOptions);
+    if (!nextConfigDetails) {
         throw new Error("Could not find next.config file");
     }
+    const { path: configPath, isTypescript: configIsTs } = nextConfigDetails;
     let configToImport;
     // Only compile if the extension is a TypeScript extension
-    if (tsExtensions.includes(configExtension)) {
+    if (configIsTs) {
         await build({
             entryPoints: [configPath],
             outfile: path.join(buildOptions.tempBuildDir, "next.config.mjs"),

package/dist/types/cache.d.ts

@@ -44,6 +44,7 @@ interface IncrementalCachedAppPageValue {
     headers?: Record<string, undefined | string | string[]>;
     postponed?: string;
     status?: number;
+    segmentData?: Map<string, Buffer>;
 }
 export type IncrementalCacheValue = CachedRedirectValue | IncrementalCachedPageValue | IncrementalCachedAppPageValue | CachedImageValue | CachedFetchValue | CachedRouteValue;
 export interface CacheHandlerContext {

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.9.14",
+  "version": "3.9.16",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -33,12 +33,12 @@
     "README.md"
   ],
   "dependencies": {
-    "@ast-grep/napi": "^0.40.0",
-    "@aws-sdk/client-cloudfront": "3.398.0",
-    "@aws-sdk/client-dynamodb": "^3.398.0",
-    "@aws-sdk/client-lambda": "^3.398.0",
-    "@aws-sdk/client-s3": "^3.398.0",
-    "@aws-sdk/client-sqs": "^3.398.0",
+    "@ast-grep/napi": "^0.40.5",
+    "@aws-sdk/client-cloudfront": "3.984.0",
+    "@aws-sdk/client-dynamodb": "3.984.0",
+    "@aws-sdk/client-lambda": "3.984.0",
+    "@aws-sdk/client-s3": "3.984.0",
+    "@aws-sdk/client-sqs": "3.984.0",
     "@node-minify/core": "^8.0.6",
     "@node-minify/terser": "^8.0.6",
     "@tsconfig/node18": "^1.0.3",