@vercel/next 3.2.9 → 3.2.11

package/dist/index.js

@@ -42986,6 +42986,8 @@ function convertRedirects(redirects, defaultStatus = 308) {
     return redirects.map(r => {
         const { src, segments } = sourceToRegex(r.source);
         const hasSegments = collectHasSegments(r.has);
+        normalizeHasKeys(r.has);
+        normalizeHasKeys(r.missing);
         try {
             const loc = replaceSegments(segments, hasSegments, r.destination, true);
             let status;
@@ -43006,6 +43008,9 @@ function convertRedirects(redirects, defaultStatus = 308) {
             if (r.has) {
                 route.has = r.has;
             }
+            if (r.missing) {
+                route.missing = r.missing;
+            }
             return route;
         }
         catch (e) {
@@ -43018,12 +43023,17 @@ function convertRewrites(rewrites, internalParamNames) {
     return rewrites.map(r => {
         const { src, segments } = sourceToRegex(r.source);
         const hasSegments = collectHasSegments(r.has);
+        normalizeHasKeys(r.has);
+        normalizeHasKeys(r.missing);
         try {
             const dest = replaceSegments(segments, hasSegments, r.destination, false, internalParamNames);
             const route = { src, dest, check: true };
             if (r.has) {
                 route.has = r.has;
             }
+            if (r.missing) {
+                route.missing = r.missing;
+            }
             return route;
         }
         catch (e) {
@@ -43037,6 +43047,8 @@ function convertHeaders(headers) {
         const obj = {};
         const { src, segments } = sourceToRegex(h.source);
         const hasSegments = collectHasSegments(h.has);
+        normalizeHasKeys(h.has);
+        normalizeHasKeys(h.missing);
         const namedSegments = segments.filter(name => name !== UN_NAMED_SEGMENT);
         const indexes = {};
         segments.forEach((name, index) => {
@@ -43064,6 +43076,9 @@ function convertHeaders(headers) {
         if (h.has) {
             route.has = h.has;
         }
+        if (h.missing) {
+            route.missing = h.missing;
+        }
         return route;
     });
 }
@@ -43114,12 +43129,17 @@ function sourceToRegex(source) {
 }
 exports.sourceToRegex = sourceToRegex;
 const namedGroupsRegex = /\(\?<([a-zA-Z][a-zA-Z0-9]*)>/g;
-function collectHasSegments(has) {
-    const hasSegments = new Set();
-    for (const hasItem of has || []) {
+const normalizeHasKeys = (hasItems = []) => {
+    for (const hasItem of hasItems) {
         if ('key' in hasItem && hasItem.type === 'header') {
             hasItem.key = hasItem.key.toLowerCase();
         }
+    }
+    return hasItems;
+};
+function collectHasSegments(has) {
+    const hasSegments = new Set();
+    for (const hasItem of has || []) {
         if (!hasItem.value && 'key' in hasItem) {
             hasSegments.add(hasItem.key);
         }
@@ -46375,7 +46395,21 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
-    const rscHeader = routesManifest.rsc?.header || '__rsc__';
+    const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
+    const completeDynamicRoutes = [];
+    if (appDir) {
+        for (const route of dynamicRoutes) {
+            completeDynamicRoutes.push(route);
+            completeDynamicRoutes.push({
+                ...route,
+                src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)?(?:/)?$'),
+                dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+            });
+        }
+    }
+    else {
+        completeDynamicRoutes.push(...dynamicRoutes);
+    }
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -46507,7 +46541,13 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...redirects,
             // middleware comes directly after redirects but before
             // beforeFiles rewrites as middleware is not a "file" route
+            ...(routesManifest?.skipMiddlewareUrlNormalize
+                ? denormalizeNextDataRoute(true)
+                : []),
             ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
+            ...(routesManifest?.skipMiddlewareUrlNormalize
+                ? normalizeNextDataRoute(true)
+                : []),
             ...beforeFilesRewrites,
             // Make sure to 404 for the /404 path itself
             ...(i18n
@@ -46666,7 +46706,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? // when resolving data routes for middleware we need to include
                     // all dynamic routes including non-SSG/SSP so that the priority
                     // is correct
-                    dynamicRoutes
+                    completeDynamicRoutes
                         .map(route => {
                         route = Object.assign({}, route);
                         let normalizedSrc = route.src;
@@ -46712,7 +46752,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
-            ...dynamicRoutes,
+            ...completeDynamicRoutes,
             ...(isNextDataServerResolving
                 ? [
                     {
@@ -48482,6 +48522,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             key: 'x-prerender-revalidate',
                             value: prerenderBypassToken,
                         },
+                        ...(matcher.missing || []),
                     ],
                 };
                 route.middlewarePath = shortPath;
@@ -48581,6 +48622,9 @@ function getRouteMatchers(info, { basePath = '', i18n }) {
         if (matcher.has) {
             m.has = normalizeHas(matcher.has);
         }
+        if (matcher.missing) {
+            m.missing = normalizeHas(matcher.missing);
+        }
         return m;
     });
 }

package/dist/server-build.js

@@ -663,7 +663,21 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             }
         }
     }
-    const rscHeader = routesManifest.rsc?.header || '__rsc__';
+    const rscHeader = routesManifest.rsc?.header?.toLowerCase() || '__rsc__';
+    const completeDynamicRoutes = [];
+    if (appDir) {
+        for (const route of dynamicRoutes) {
+            completeDynamicRoutes.push(route);
+            completeDynamicRoutes.push({
+                ...route,
+                src: route.src.replace(new RegExp((0, escape_string_regexp_1.default)('(?:/)?$')), '(?:\\.rsc)?(?:/)?$'),
+                dest: route.dest?.replace(/($|\?)/, '.rsc$1'),
+            });
+        }
+    }
+    else {
+        completeDynamicRoutes.push(...dynamicRoutes);
+    }
     return {
         wildcard: wildcardConfig,
         images: imagesManifest?.images?.loader === 'default'
@@ -795,7 +809,13 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
             ...redirects,
             // middleware comes directly after redirects but before
             // beforeFiles rewrites as middleware is not a "file" route
+            ...(routesManifest?.skipMiddlewareUrlNormalize
+                ? denormalizeNextDataRoute(true)
+                : []),
             ...(isCorrectMiddlewareOrder ? middleware.staticRoutes : []),
+            ...(routesManifest?.skipMiddlewareUrlNormalize
+                ? normalizeNextDataRoute(true)
+                : []),
             ...beforeFilesRewrites,
             // Make sure to 404 for the /404 path itself
             ...(i18n
@@ -954,7 +974,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 ? // when resolving data routes for middleware we need to include
                     // all dynamic routes including non-SSG/SSP so that the priority
                     // is correct
-                    dynamicRoutes
+                    completeDynamicRoutes
                         .map(route => {
                         route = Object.assign({}, route);
                         let normalizedSrc = route.src;
@@ -1000,7 +1020,7 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                 : []),
             // Dynamic routes (must come after dataRoutes as dataRoutes are more
             // specific)
-            ...dynamicRoutes,
+            ...completeDynamicRoutes,
             ...(isNextDataServerResolving
                 ? [
                     {

package/dist/utils.js

@@ -1549,6 +1549,7 @@ async function getMiddlewareBundle({ entryPath, outputDirectory, routesManifest,
                             key: 'x-prerender-revalidate',
                             value: prerenderBypassToken,
                         },
+                        ...(matcher.missing || []),
                     ],
                 };
                 route.middlewarePath = shortPath;
@@ -1648,6 +1649,9 @@ function getRouteMatchers(info, { basePath = '', i18n }) {
         if (matcher.has) {
             m.has = normalizeHas(matcher.has);
         }
+        if (matcher.missing) {
+            m.missing = normalizeHas(matcher.missing);
+        }
         return m;
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.2.9",
+  "version": "3.2.11",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -46,7 +46,7 @@
     "@types/webpack-sources": "3.2.0",
     "@vercel/build-utils": "5.5.7",
     "@vercel/nft": "0.22.1",
-    "@vercel/routing-utils": "2.1.2",
+    "@vercel/routing-utils": "2.1.3",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "cheerio": "1.0.0-rc.10",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "0964be17106419263b3f38d67784dd97b8b0c565"
+  "gitHead": "1b211f28dfdcb112f1aecb53a2b9f257ecc58420"
 }