@vercel/next 12.0.3 → 13.0.0

package/dist/adapter/node-handler.js

@@ -167,7 +167,8 @@ const getHandlerSource = (ctx) => `
         return {
           matchedPathname: inversedAppRoutesManifest[route.page] || route.page,
           locale: normalizeResult.locale,
-          matches
+          matches,
+          matchedRoute: route
         };
       }
     }
@@ -236,6 +237,15 @@ const getHandlerSource = (ctx) => `
     const decoder = new TextDecoder("utf-8");
     return decoder.decode(bytes);
   }
+  function isOptionalCatchallTemplateCapture(matchedRoute, matchKey, matchValue) {
+    if (!matchedRoute) {
+      return false;
+    }
+    const prefixedParamName = matchedRoute.routeKeys?.[matchKey] ?? matchKey;
+    const paramName = prefixedParamName.startsWith("nxtP") ? prefixedParamName.slice(4) : prefixedParamName;
+    const placeholder = `[[...${paramName}]]`;
+    return matchValue === placeholder && matchedRoute.page.split("/").includes(placeholder);
+  }
   return async function handler(req, res, internalMetadata) {
     try {
       const parsedUrl = new URL(req.url || "/", "http://n");
@@ -247,13 +257,21 @@ const getHandlerSource = (ctx) => `
       const {
         matchedPathname: page,
         locale,
-        matches
+        matches,
+        matchedRoute
       } = matchUrlToPage(urlPathname);
       const isAppDir = page.match(/\/(page|route)$/);
       let addedMatchesToUrl = false;
       for (const matchKey in matches?.groups || {}) {
         const matchValue = matches?.groups?.[matchKey];
         if (!parsedUrl.searchParams.has(matchKey) && matchValue) {
+          if (isOptionalCatchallTemplateCapture(
+            matchedRoute,
+            matchKey,
+            matchValue
+          )) {
+            continue;
+          }
           parsedUrl.searchParams.set(matchKey, matchValue);
           addedMatchesToUrl = true;
         }