next 15.2.0-canary.65 → 15.2.0-canary.66

package/dist/server/base-server.js

@@ -679,27 +679,30 @@ class Server {
                         parsedUrl.pathname = `/${defaultLocale}${parsedUrl.pathname}`;
                     }
                     const pathnameBeforeRewrite = parsedUrl.pathname;
-                    const rewriteParams = utils.handleRewrites(req, parsedUrl);
-                    const rewriteParamKeys = Object.keys(rewriteParams);
+                    const rewriteParamKeys = Object.keys(utils.handleRewrites(req, parsedUrl));
                     const didRewrite = pathnameBeforeRewrite !== parsedUrl.pathname;
                     if (didRewrite && parsedUrl.pathname) {
                         (0, _requestmeta.addRequestMeta)(req, 'rewroteURL', parsedUrl.pathname);
                     }
-                    // Normalize all the query params to remove the prefixes.
-                    const routeParamKeys = new Set();
+                    // Create a copy of the query params to avoid mutating the original
+                    // object. This prevents any overlapping query params that have the
+                    // same normalized key from causing issues.
+                    const queryParams = {
+                        ...parsedUrl.query
+                    };
                     for (const [key, value] of Object.entries(parsedUrl.query)){
-                        if (typeof value === 'undefined') continue;
                         const normalizedKey = (0, _utils3.normalizeNextQueryParam)(key);
-                        if (normalizedKey) {
-                            parsedUrl.query[normalizedKey] = value;
-                            routeParamKeys.add(normalizedKey);
-                            delete parsedUrl.query[key];
-                        }
+                        if (!normalizedKey) continue;
+                        // Remove the prefixed key from the query params because we want
+                        // to consume it for the dynamic route matcher.
+                        delete parsedUrl.query[key];
+                        if (typeof value === 'undefined') continue;
+                        queryParams[normalizedKey] = value;
                     }
                     // interpolate dynamic params and normalize URL if needed
                     if (pageIsDynamic) {
                         let params = {};
-                        let paramsResult = utils.normalizeDynamicRouteParams(parsedUrl.query, false);
+                        let paramsResult = utils.normalizeDynamicRouteParams(queryParams, false);
                         // for prerendered ISR paths we attempt parsing the route
                         // params from the URL directly as route-matches may not
                         // contain the correct values due to the filesystem path
@@ -746,7 +749,7 @@ class Server {
                         // Try to parse the params from the query if we couldn't parse them
                         // from the route matches but ignore missing optional params.
                         if (!paramsResult.hasValidParams) {
-                            paramsResult = utils.normalizeDynamicRouteParams(parsedUrl.query, true);
+                            paramsResult = utils.normalizeDynamicRouteParams(queryParams, true);
                             if (paramsResult.hasValidParams) {
                                 params = paramsResult.params;
                             }
@@ -781,9 +784,6 @@ class Server {
                             ...Object.keys(((_utils_defaultRouteRegex = utils.defaultRouteRegex) == null ? void 0 : _utils_defaultRouteRegex.groups) || {})
                         ]);
                     }
-                    for (const key of routeParamKeys){
-                        delete parsedUrl.query[key];
-                    }
                     parsedUrl.pathname = matchedPath;
                     url.pathname = parsedUrl.pathname;
                     finished = await this.normalizeAndAttachMetadata(req, res, parsedUrl);