@opennextjs/aws 3.7.6 → 3.8.0

package/dist/adapters/middleware.js

@@ -75,7 +75,9 @@ const defaultHandler = async (internalEvent, options) => {
                 };
             }
         }
-        result.headers[INTERNAL_EVENT_REQUEST_ID] = requestId;
+        if (process.env.OPEN_NEXT_REQUEST_ID_HEADER || globalThis.openNextDebug) {
+            result.headers[INTERNAL_EVENT_REQUEST_ID] = requestId;
+        }
         debug("Middleware response", result);
         return result;
     });

package/dist/build/compileConfig.d.ts

@@ -4,18 +4,33 @@ import type { OpenNextConfig } from "../types/open-next.js";
  *
  * The configuration is always compiled for Node.js and for the edge only if needed.
  *
- * @param baseDir Directory where to look for the configuration.
- * @param openNextConfigPath Override the default configuration when provided. Relative to baseDir.
+ * @param openNextConfigPath Path to the configuration file. Absolute or relative to cwd.
  * @param nodeExternals Coma separated list of Externals for the Node.js compilation.
  * @param compileEdge Force compiling for the edge runtime when true
  * @return The configuration and the build directory.
  */
-export declare function compileOpenNextConfig(baseDir: string, openNextConfigPath?: string, { nodeExternals, compileEdge }?: {
+export declare function compileOpenNextConfig(openNextConfigPath: string, { nodeExternals, compileEdge }?: {
     nodeExternals?: string | undefined;
     compileEdge?: boolean | undefined;
 }): Promise<{
     config: OpenNextConfig;
     buildDir: string;
 }>;
-export declare function compileOpenNextConfigNode(sourcePath: string, outputDir: string, externals: string[]): string;
-export declare function compileOpenNextConfigEdge(sourcePath: string, outputDir: string, externals: string[]): void;
+/**
+ * Compiles the OpenNext configuration for Node.
+ *
+ * @param openNextConfigPath Path to the configuration file. Absolute or relative to cwd.
+ * @param outputDir Folder where to output the compiled config file (`open-next.config.mjs`).
+ * @param externals List of packages that should not be bundled.
+ * @return Path to the compiled config.
+ */
+export declare function compileOpenNextConfigNode(openNextConfigPath: string, outputDir: string, externals: string[]): string;
+/**
+ * Compiles the OpenNext configuration for Edge.
+ *
+ * @param openNextConfigPath Path to the configuration file. Absolute or relative to cwd.
+ * @param outputDir Folder where to output the compiled config file (`open-next.config.edge.mjs`).
+ * @param externals List of packages that should not be bundled.
+ * @return Path to the compiled config.
+ */
+export declare function compileOpenNextConfigEdge(openNextConfigPath: string, outputDir: string, externals: string[]): string;

package/dist/build/compileConfig.js

@@ -9,16 +9,14 @@ import { validateConfig } from "./validateConfig.js";
  *
  * The configuration is always compiled for Node.js and for the edge only if needed.
  *
- * @param baseDir Directory where to look for the configuration.
- * @param openNextConfigPath Override the default configuration when provided. Relative to baseDir.
+ * @param openNextConfigPath Path to the configuration file. Absolute or relative to cwd.
  * @param nodeExternals Coma separated list of Externals for the Node.js compilation.
  * @param compileEdge Force compiling for the edge runtime when true
  * @return The configuration and the build directory.
  */
-export async function compileOpenNextConfig(baseDir, openNextConfigPath, { nodeExternals = "", compileEdge = false } = {}) {
-    const sourcePath = path.join(baseDir, openNextConfigPath ?? "open-next.config.ts");
+export async function compileOpenNextConfig(openNextConfigPath, { nodeExternals = "", compileEdge = false } = {}) {
     const buildDir = fs.mkdtempSync(path.join(os.tmpdir(), "open-next-tmp"));
-    let configPath = compileOpenNextConfigNode(sourcePath, buildDir, nodeExternals.split(","));
+    let configPath = compileOpenNextConfigNode(openNextConfigPath, buildDir, nodeExternals.split(","));
     // On Windows, we need to use file:// protocol to load the config file using import()
     if (process.platform === "win32")
         configPath = `file://${configPath}`;
@@ -33,7 +31,7 @@ export async function compileOpenNextConfig(baseDir, openNextConfigPath, { nodeE
     const usesEdgeRuntime = (config.middleware?.external && config.middleware.runtime !== "node") ||
         Object.values(config.functions || {}).some((fn) => fn.runtime === "edge");
     if (usesEdgeRuntime || compileEdge) {
-        compileOpenNextConfigEdge(sourcePath, buildDir, config.edgeExternals ?? []);
+        compileOpenNextConfigEdge(openNextConfigPath, buildDir, config.edgeExternals ?? []);
     }
     else {
         // Skip compiling for the edge runtime.
@@ -41,18 +39,26 @@ export async function compileOpenNextConfig(baseDir, openNextConfigPath, { nodeE
     }
     return { config, buildDir };
 }
-export function compileOpenNextConfigNode(sourcePath, outputDir, externals) {
+/**
+ * Compiles the OpenNext configuration for Node.
+ *
+ * @param openNextConfigPath Path to the configuration file. Absolute or relative to cwd.
+ * @param outputDir Folder where to output the compiled config file (`open-next.config.mjs`).
+ * @param externals List of packages that should not be bundled.
+ * @return Path to the compiled config.
+ */
+export function compileOpenNextConfigNode(openNextConfigPath, outputDir, externals) {
     const outputPath = path.join(outputDir, "open-next.config.mjs");
     logger.debug("Compiling open-next.config.ts for Node.", outputPath);
     //Check if open-next.config.ts exists
-    if (!fs.existsSync(sourcePath)) {
+    if (!fs.existsSync(openNextConfigPath)) {
         //Create a simple open-next.config.mjs file
         logger.debug("Cannot find open-next.config.ts. Using default config.");
         fs.writeFileSync(outputPath, "export default { default: { } };");
     }
     else {
         buildSync({
-            entryPoints: [sourcePath],
+            entryPoints: [openNextConfigPath],
             outfile: outputPath,
             bundle: true,
             format: "esm",
@@ -71,11 +77,19 @@ export function compileOpenNextConfigNode(sourcePath, outputDir, externals) {
     }
     return outputPath;
 }
-export function compileOpenNextConfigEdge(sourcePath, outputDir, externals) {
+/**
+ * Compiles the OpenNext configuration for Edge.
+ *
+ * @param openNextConfigPath Path to the configuration file. Absolute or relative to cwd.
+ * @param outputDir Folder where to output the compiled config file (`open-next.config.edge.mjs`).
+ * @param externals List of packages that should not be bundled.
+ * @return Path to the compiled config.
+ */
+export function compileOpenNextConfigEdge(openNextConfigPath, outputDir, externals) {
     const outputPath = path.join(outputDir, "open-next.config.edge.mjs");
     logger.debug("Compiling open-next.config.ts for edge runtime.", outputPath);
     buildSync({
-        entryPoints: [sourcePath],
+        entryPoints: [openNextConfigPath],
         outfile: outputPath,
         bundle: true,
         format: "esm",
@@ -88,4 +102,5 @@ export function compileOpenNextConfigEdge(sourcePath, outputDir, externals) {
             "process.env.NODE_ENV": '"production"',
         },
     });
+    return outputPath;
 }

package/dist/build/copyTracedFiles.d.ts

@@ -1,3 +1,4 @@
+export declare function isExcluded(srcPath: string): boolean;
 interface CopyTracedFilesOptions {
     buildOutputPath: string;
     packagePath: string;

package/dist/build/copyTracedFiles.js

@@ -18,8 +18,13 @@ const EXCLUDED_PACKAGES = [
     "next/dist/compiled/babel-packages",
     "next/dist/compiled/amphtml-validator",
 ];
-function isExcluded(srcPath) {
-    return EXCLUDED_PACKAGES.some((excluded) => srcPath.match(getCrossPlatformPathRegex(`/node_modules/${excluded}/`)));
+export function isExcluded(srcPath) {
+    return EXCLUDED_PACKAGES.some((excluded) => 
+    // `pnpm` can create a symbolic link that points to the pnpm store folder
+    // This will live under `/node_modules/sharp`. We need to handle this in our regex
+    srcPath.match(getCrossPlatformPathRegex(`/node_modules/${excluded}(?:/|$)`, {
+        escape: false,
+    })));
 }
 function copyPatchFile(outputDir) {
     const patchFile = path.join(__dirname, "patch", "patchedAsyncStorage.js");

package/dist/build/edge/createEdgeBundle.js

@@ -15,7 +15,8 @@ import { copyOpenNextConfig, esbuildAsync } from "../helper.js";
 export async function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, options, defaultConverter, overrides, additionalInject, includeCache, additionalExternals, onlyBuildOnce, name, additionalPlugins: additionalPluginsFn, }) {
     const isInCloudflare = await isEdgeRuntime(overrides);
     function override(target) {
-        return typeof overrides?.[target] === "string"
+        return typeof overrides?.[target] === "string" ||
+            typeof overrides?.[target] === "function"
             ? overrides[target]
             : undefined;
     }

package/dist/build/installDeps.js

@@ -63,7 +63,7 @@ export function installDependencies(outputDir, installOptions) {
         logger.info(`Dependencies installed for ${name}`);
     }
     catch (e) {
-        logger.error(e.stdout.toString());
+        logger.error(e.toString());
         logger.error("Could not install dependencies");
     }
 }

package/dist/build.js

@@ -1,3 +1,4 @@
+import path from "node:path";
 import url from "node:url";
 import { buildNextjsApp, setStandaloneBuildMode, } from "./build/buildNextApp.js";
 import { compileCache } from "./build/compileCache.js";
@@ -17,7 +18,7 @@ export async function build(openNextConfigPath, nodeExternals) {
     showWarningOnWindows();
     const baseDir = process.cwd();
     const openNextDistDir = url.fileURLToPath(new URL(".", import.meta.url));
-    const { config, buildDir } = await compileOpenNextConfig(baseDir, openNextConfigPath, { nodeExternals });
+    const { config, buildDir } = await compileOpenNextConfig(path.join(baseDir, openNextConfigPath ?? "open-next.config.ts"), { nodeExternals });
     // Initialize options
     const options = buildHelper.normalizeOptions(config, openNextDistDir, buildDir);
     logger.setLevel(options.debug ? "debug" : "info");

package/dist/core/requestHandler.js

@@ -31,7 +31,7 @@ export async function openNextHandler(internalEvent, options) {
             initialHeaders.host = initialHeaders["x-forwarded-host"];
         }
         debug("internalEvent", internalEvent);
-        // These 2 will get overwritten by the routing handler if not using an external middleware
+        // These 3 will get overwritten by the routing handler if not using an external middleware
         const internalHeaders = {
             initialPath: initialHeaders[INTERNAL_HEADER_INITIAL_URL] ?? internalEvent.rawPath,
             resolvedRoutes: initialHeaders[INTERNAL_HEADER_RESOLVED_ROUTES]

package/dist/core/routing/cacheInterceptor.d.ts

@@ -1,2 +1,2 @@
-import type { InternalEvent, InternalResult } from "../../types/open-next";
-export declare function cacheInterceptor(event: InternalEvent): Promise<InternalEvent | InternalResult>;
+import type { InternalEvent, InternalResult, MiddlewareEvent } from "../../types/open-next";
+export declare function cacheInterceptor(event: MiddlewareEvent): Promise<InternalEvent | InternalResult>;

package/dist/core/routing/cacheInterceptor.js

@@ -103,8 +103,12 @@ async function generateResult(event, localizedPath, cachedValue, lastModified) {
     const cacheControl = await computeCacheControl(localizedPath, body, event.headers.host, cachedValue.revalidate, lastModified);
     return {
         type: "core",
-        // sometimes other status codes can be cached, like 404. For these cases, we should return the correct status code
-        statusCode: cachedValue.meta?.status ?? 200,
+        // Sometimes other status codes can be cached, like 404. For these cases, we should return the correct status code
+        // Also set the status code to the rewriteStatusCode if defined
+        // This can happen in handleMiddleware in routingHandler.
+        // `NextResponse.rewrite(url, { status: xxx})
+        // The rewrite status code should take precedence over the cached one
+        statusCode: event.rewriteStatusCode ?? cachedValue.meta?.status ?? 200,
         body: toReadableStream(body, false),
         isBase64Encoded: false,
         headers: {
@@ -178,7 +182,9 @@ export async function cacheInterceptor(event) {
             if (cachedData.value?.type === "app" ||
                 cachedData.value?.type === "route") {
                 const tags = getTagsFromValue(cachedData.value);
-                const _hasBeenRevalidated = await hasBeenRevalidated(localizedPath, tags, cachedData);
+                const _hasBeenRevalidated = cachedData.shouldBypassTagCache
+                    ? false
+                    : await hasBeenRevalidated(localizedPath, tags, cachedData);
                 if (_hasBeenRevalidated) {
                     return event;
                 }
@@ -207,7 +213,7 @@ export async function cacheInterceptor(event) {
                     const isBinary = isBinaryContentType(String(cachedData.value.meta?.headers?.["content-type"]));
                     return {
                         type: "core",
-                        statusCode: cachedData.value.meta?.status ?? 200,
+                        statusCode: event.rewriteStatusCode ?? cachedData.value.meta?.status ?? 200,
                         body: toReadableStream(cachedData.value.body, isBinary),
                         headers: {
                             ...cacheControl,

package/dist/core/routing/middleware.d.ts

@@ -1,9 +1,4 @@
-import type { InternalEvent, InternalResult } from "../../types/open-next.js";
-type MiddlewareEvent = InternalEvent & {
-    responseHeaders?: Record<string, string | string[]>;
-    isExternalRewrite?: boolean;
-    rewriteStatusCode?: number;
-};
+import type { InternalEvent, InternalResult, MiddlewareEvent } from "../../types/open-next.js";
 type Middleware = (request: Request) => Response | Promise<Response>;
 type MiddlewareLoader = () => Promise<{
     default: Middleware;

package/dist/core/routing/middleware.js

@@ -151,6 +151,6 @@ export async function handleMiddleware(internalEvent, initialSearch, middlewareL
         cookies: internalEvent.cookies,
         remoteAddress: internalEvent.remoteAddress,
         isExternalRewrite,
-        rewriteStatusCode: statusCode,
+        rewriteStatusCode: rewriteUrl && !isExternalRewrite ? statusCode : undefined,
     };
 }

package/dist/core/routingHandler.js

@@ -79,10 +79,20 @@ export default async function routingHandler(event, { assetResolver }) {
         if (isInternalResult(middlewareEventOrResult)) {
             return middlewareEventOrResult;
         }
-        headers = {
-            ...middlewareEventOrResult.responseHeaders,
-            ...headers,
-        };
+        const middlewareHeadersPrioritized = globalThis.openNextConfig.dangerous
+            ?.middlewareHeadersOverrideNextConfigHeaders ?? false;
+        if (middlewareHeadersPrioritized) {
+            headers = {
+                ...headers,
+                ...middlewareEventOrResult.responseHeaders,
+            };
+        }
+        else {
+            headers = {
+                ...middlewareEventOrResult.responseHeaders,
+                ...headers,
+            };
+        }
         let isExternalRewrite = middlewareEventOrResult.isExternalRewrite ?? false;
         eventOrResult = middlewareEventOrResult;
         if (!isExternalRewrite) {

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

@@ -15,6 +15,11 @@ export type InternalEvent = {
     readonly cookies: Record<string, string>;
     readonly remoteAddress: string;
 } & BaseEventOrResult<"core">;
+export type MiddlewareEvent = InternalEvent & {
+    responseHeaders?: Record<string, string | string[]>;
+    isExternalRewrite?: boolean;
+    rewriteStatusCode?: number;
+};
 export type InternalResult = {
     statusCode: number;
     headers: Record<string, string | string[]>;
@@ -58,6 +63,16 @@ export interface DangerousOptions {
      * This is executed for every request and after next config headers and middleware has executed.
      */
     headersAndCookiesPriority?: (event: InternalEvent) => "middleware" | "handler";
+    /**
+     * Configuration option to prioritize headers set via middleware over headers set via the option in the Next config.
+     *
+     * The default will change to 'true' in v4.
+     *
+     * See also {@link https://nextjs.org/docs/app/api-reference/file-conventions/middleware#execution-order}
+     *
+     * @default false
+     */
+    middlewareHeadersOverrideNextConfigHeaders?: boolean;
 }
 export type BaseOverride = {
     name: string;

package/dist/utils/cache.js

@@ -13,7 +13,9 @@ export async function hasBeenRevalidated(key, tags, cacheEntry) {
     }
     const lastModified = cacheEntry.lastModified ?? Date.now();
     if (globalThis.tagCache.mode === "nextMode") {
-        return await globalThis.tagCache.hasBeenRevalidated(tags, lastModified);
+        return tags.length === 0
+            ? false
+            : await globalThis.tagCache.hasBeenRevalidated(tags, lastModified);
     }
     // TODO: refactor this, we should introduce a new method in the tagCache interface so that both implementations use hasBeenRevalidated
     const _lastModified = await globalThis.tagCache.getLastModified(key, lastModified);
@@ -25,7 +27,9 @@ export function getTagsFromValue(value) {
     }
     // The try catch is necessary for older version of next.js that may fail on this
     try {
-        return value.meta?.headers?.["x-next-cache-tags"]?.split(",") ?? [];
+        const cacheTags = value.meta?.headers?.["x-next-cache-tags"]?.split(",") ?? [];
+        delete value.meta?.headers?.["x-next-cache-tags"];
+        return cacheTags;
     }
     catch (e) {
         return [];

package/package.json

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