@opennextjs/aws 3.5.1 → 3.5.2

package/dist/build/copyTracedFiles.js

@@ -2,9 +2,21 @@ import url from "node:url";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, readlinkSync, statSync, symlinkSync, writeFileSync, } from "node:fs";
 import path from "node:path";
 import { loadConfig, loadPrerenderManifest } from "../adapters/config/util.js";
+import { getCrossPlatformPathRegex } from "../utils/regex.js";
 import logger from "../logger.js";
 import { MIDDLEWARE_TRACE_FILE } from "./constant.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+//TODO: we need to figure which packages we could safely remove
+const EXCLUDED_PACKAGES = [
+    "caniuse-lite",
+    "sharp",
+    // This seems to be only in Next 15
+    // Some of sharp deps are under the @img scope
+    "@img",
+];
+function isExcluded(srcPath) {
+    return EXCLUDED_PACKAGES.some((excluded) => srcPath.match(getCrossPlatformPathRegex(`/node_modules/${excluded}/`)));
+}
 function copyPatchFile(outputDir) {
     const patchFile = path.join(__dirname, "patch", "patchedAsyncStorage.js");
     const outputPatchFile = path.join(outputDir, "patchedAsyncStorage.cjs");
@@ -119,11 +131,8 @@ File ${fullFilePath} does not exist
     });
     //Actually copy the files
     filesToCopy.forEach((to, from) => {
-        if (
-        //TODO: we need to figure which packages we could safely remove
-        from.includes(path.join("node_modules", "caniuse-lite")) ||
-            // from.includes("jest-worker") || This ones seems necessary for next 12
-            from.includes(path.join("node_modules", "sharp"))) {
+        // We don't want to copy excluded packages (i.e sharp)
+        if (isExcluded(from)) {
             return;
         }
         mkdirSync(path.dirname(to), { recursive: true });

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

@@ -3,12 +3,12 @@ import type { InternalEvent, InternalResult } from "../../types/open-next";
 export declare function getNextConfigHeaders(event: InternalEvent, configHeaders?: Header[] | undefined): Record<string, string | undefined>;
 export declare function handleRewrites<T extends RewriteDefinition>(event: InternalEvent, rewrites: T[]): {
     internalEvent: {
+        query: Record<string, string | string[]>;
         rawPath: string;
         url: string;
         method: string;
         body?: Buffer;
         headers: Record<string, string>;
-        query: Record<string, string | string[]>;
         cookies: Record<string, string>;
         remoteAddress: string;
         type: "core";

package/dist/core/routing/matcher.js

@@ -145,10 +145,17 @@ export function handleRewrites(event, rewrites) {
             rewrittenHost = unescapeRegex(toDestinationHost(params));
             rewrittenQuery = unescapeRegex(toDestinationQuery(params));
         }
+        // We need to strip the locale from the path if it's a local api route
+        if (NextConfig.i18n && !isExternalRewrite) {
+            const strippedPathLocale = rewrittenPath.replace(new RegExp(`^/(${NextConfig.i18n.locales.join("|")})`), "");
+            if (strippedPathLocale.startsWith("/api/")) {
+                rewrittenPath = strippedPathLocale;
+            }
+        }
         rewrittenUrl = isExternalRewrite
             ? `${protocol}//${rewrittenHost}${rewrittenPath}`
             : new URL(rewrittenPath, event.url).href;
-        // Should we merge the query params or use only the ones from the rewrite?
+        // We merge query params from the source and the destination
         finalQuery = {
             ...query,
             ...convertFromQueryString(rewrittenQuery),
@@ -159,6 +166,7 @@ export function handleRewrites(event, rewrites) {
     return {
         internalEvent: {
             ...event,
+            query: finalQuery,
             rawPath: new URL(rewrittenUrl).pathname,
             url: rewrittenUrl,
         },

package/package.json

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