@opennextjs/aws 3.6.1 → 3.6.2

package/dist/build/compileConfig.js

@@ -83,5 +83,9 @@ export function compileOpenNextConfigEdge(sourcePath, outputDir, externals) {
         conditions: ["worker", "browser"],
         platform: "browser",
         external: externals,
+        define: {
+            // with the default esbuild config, the NODE_ENV will be set to "development", we don't want that
+            "process.env.NODE_ENV": '"production"',
+        },
     });
 }

package/dist/build/createMiddleware.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { loadFunctionsConfigManifest, loadMiddlewareManifest, } from "../adapters/config/util.js";
 import logger from "../logger.js";
-import { buildEdgeBundle } from "./edge/createEdgeBundle.js";
+import { buildEdgeBundle, copyMiddlewareResources, } from "./edge/createEdgeBundle.js";
 import * as buildHelper from "./helper.js";
 import { installDependencies } from "./installDeps.js";
 import { buildBundledNodeMiddleware, buildExternalNodeMiddleware, } from "./middleware/buildNodeMiddleware.js";
@@ -31,6 +31,7 @@ export async function createMiddleware(options, { forceOnlyBuildOnce = false } =
     }
     if (config.middleware?.external) {
         const outputPath = path.join(outputDir, "middleware");
+        copyMiddlewareResources(options, edgeMiddlewareInfo, outputPath);
         fs.mkdirSync(outputPath, { recursive: true });
         // Copy open-next.config.mjs
         buildHelper.copyOpenNextConfig(options.buildDir, outputPath, await buildHelper.isEdgeRuntime(config.middleware.override));

package/dist/core/routing/cacheInterceptor.js

@@ -102,6 +102,32 @@ async function generateResult(event, localizedPath, cachedValue, lastModified) {
         },
     };
 }
+/**
+ *
+ * https://github.com/vercel/next.js/blob/34039551d2e5f611c0abde31a197d9985918adaf/packages/next/src/shared/lib/router/utils/escape-path-delimiters.ts#L2-L10
+ */
+function escapePathDelimiters(segment, escapeEncoded) {
+    return segment.replace(new RegExp(`([/#?]${escapeEncoded ? "|%(2f|23|3f|5c)" : ""})`, "gi"), (char) => encodeURIComponent(char));
+}
+/**
+ *
+ * SSG cache key needs to be decoded, but some characters needs to be properly escaped
+ * https://github.com/vercel/next.js/blob/34039551d2e5f611c0abde31a197d9985918adaf/packages/next/src/server/lib/router-utils/decode-path-params.ts#L11-L26
+ */
+function decodePathParams(pathname) {
+    return pathname
+        .split("/")
+        .map((segment) => {
+        try {
+            return escapePathDelimiters(decodeURIComponent(segment), true);
+        }
+        catch (e) {
+            // If decodeURIComponent fails, we return the original segment
+            return segment;
+        }
+    })
+        .join("/");
+}
 export async function cacheInterceptor(event) {
     if (Boolean(event.headers["next-action"]) ||
         Boolean(event.headers["x-prerender-revalidate"]))
@@ -114,6 +140,8 @@ export async function cacheInterceptor(event) {
     }
     // We also need to remove trailing slash
     localizedPath = localizedPath.replace(/\/$/, "");
+    // Then we decode the path params
+    localizedPath = decodePathParams(localizedPath);
     debug("Checking cache for", localizedPath, PrerenderManifest);
     const isISR = Object.keys(PrerenderManifest.routes).includes(localizedPath ?? "/") ||
         Object.values(PrerenderManifest.dynamicRoutes).some((dr) => new RegExp(dr.routeRegex).test(localizedPath));

package/dist/core/routing/matcher.js

@@ -1,5 +1,6 @@
 import { NextConfig } from "../../adapters/config/index";
 import { compile, match } from "path-to-regexp";
+import { normalizeRepeatedSlashes } from "../../utils/normalize-path";
 import { emptyReadableStream, toReadableStream } from "../../utils/stream";
 import { debug } from "../../adapters/logger";
 import { handleLocaleRedirect, localizePath } from "./i18n";
@@ -169,6 +170,25 @@ export function handleRewrites(event, rewrites) {
         isExternalRewrite,
     };
 }
+// Normalizes repeated slashes in the path e.g. hello//world -> hello/world
+// or backslashes to forward slashes. This prevents requests such as //domain
+// from invoking the middleware with `request.url === "domain"`.
+// See: https://github.com/vercel/next.js/blob/3ecf087f10fdfba4426daa02b459387bc9c3c54f/packages/next/src/server/base-server.ts#L1016-L1020
+function handleRepeatedSlashRedirect(event) {
+    // Redirect `https://example.com//foo` to `https://example.com/foo`.
+    if (event.rawPath.match(/(\\|\/\/)/)) {
+        return {
+            type: event.type,
+            statusCode: 308,
+            headers: {
+                Location: normalizeRepeatedSlashes(new URL(event.url)),
+            },
+            body: emptyReadableStream(),
+            isBase64Encoded: false,
+        };
+    }
+    return false;
+}
 function handleTrailingSlashRedirect(event) {
     // When rawPath is `//domain`, `url.host` would be `domain`.
     // https://github.com/opennextjs/opennextjs-aws/issues/355
@@ -215,6 +235,9 @@ function handleTrailingSlashRedirect(event) {
     return false;
 }
 export function handleRedirects(event, redirects) {
+    const repeatedSlashRedirect = handleRepeatedSlashRedirect(event);
+    if (repeatedSlashRedirect)
+        return repeatedSlashRedirect;
     const trailingSlashRedirect = handleTrailingSlashRedirect(event);
     if (trailingSlashRedirect)
         return trailingSlashRedirect;

package/dist/overrides/converters/node.js

@@ -17,7 +17,8 @@ const converter = {
             Array.isArray(value) ? value.join(",") : value,
         ])
             .filter(([key]) => key));
-        const url = new URL(req.url, `http://${extractHostFromHeaders(headers)}`);
+        // 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);
         return {
             type: "core",

package/dist/plugins/edge.js

@@ -27,7 +27,7 @@ export function openNextEdgePlugins({ nextDir, middlewareInfo, isInCloudflare, }
         name: "opennext-edge",
         setup(build) {
             logger.debug(chalk.blue("OpenNext Edge plugin"));
-            build.onResolve({ filter: /\.(mjs|wasm)$/g }, () => {
+            build.onResolve({ filter: /\.(mjs|wasm)$/ }, () => {
                 return {
                     external: true,
                 };

package/dist/utils/normalize-path.d.ts

@@ -1,2 +1,3 @@
 export declare function normalizePath(path: string): string;
+export declare function normalizeRepeatedSlashes(url: URL): string;
 export declare function getMonorepoRelativePath(relativePath?: string): string;

package/dist/utils/normalize-path.js

@@ -2,6 +2,13 @@ import path from "node:path";
 export function normalizePath(path) {
     return path.replace(/\\/g, "/");
 }
+// See: https://github.com/vercel/next.js/blob/3ecf087f10fdfba4426daa02b459387bc9c3c54f/packages/next/src/shared/lib/utils.ts#L348
+export function normalizeRepeatedSlashes(url) {
+    const urlNoQuery = url.host + url.pathname;
+    return `${url.protocol}//${urlNoQuery
+        .replace(/\\/g, "/")
+        .replace(/\/\/+/g, "/")}${url.search}`;
+}
 export function getMonorepoRelativePath(relativePath = "../..") {
     return path.join(globalThis.monorepoPackagePath
         .split("/")

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -14,8 +14,8 @@
   "main": "./dist/index.js",
   "exports": {
     "./*": {
-      "default": "./dist/*",
-      "types": "./dist/*.d.ts"
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*"
     }
   },
   "typesVersions": {
@@ -44,7 +44,7 @@
     "@tsconfig/node18": "^1.0.1",
     "aws4fetch": "^1.0.18",
     "chalk": "^5.3.0",
-    "esbuild": "0.19.2",
+    "esbuild": "0.25.4",
     "express": "5.0.1",
     "path-to-regexp": "^6.3.0",
     "urlpattern-polyfill": "^10.0.0",