@vercel/next 3.2.5 → 3.2.6

package/dist/index.js

@@ -45387,6 +45387,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const notFoundPreviewRoutes = [];
+    const appDirVaryRoutes = [];
+    // ensure Vary header is set for static app paths
+    // TODO: remove when we are able to set initial headers on Prerender
+    if (appPathRoutesManifest) {
+        for (const route of Object.values(appPathRoutesManifest)) {
+            if (!prerenders[path_1.default.posix.join('.', entryDirectory, route)]) {
+                continue;
+            }
+            let src = path_1.default.posix.join('/', entryDirectory, route);
+            if ((0, utils_1.isDynamicRoute)(route)) {
+                const dynamicRoute = routesManifest.dynamicRoutes.find(r => {
+                    return r.page === route;
+                });
+                if (dynamicRoute &&
+                    'namedRegex' in dynamicRoute &&
+                    dynamicRoute.namedRegex) {
+                    src = src.replace(new RegExp(`${(0, escape_string_regexp_1.default)(route)}$`), dynamicRoute.namedRegex.replace(/^\^/, ''));
+                }
+            }
+            appDirVaryRoutes.push({
+                src,
+                headers: {
+                    vary: '__rsc__, __next_router_state_tree__, __next_router_prefetch__',
+                },
+                continue: true,
+            });
+        }
+    }
     if (prerenderManifest.notFoundRoutes?.length > 0 && canUsePreviewMode) {
         // we combine routes into one src here to reduce the number of needed
         // routes since only the status is being modified and we don't want
@@ -45894,10 +45922,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         src: path_1.default.posix.join('/', entryDirectory, '/(.*).rsc$'),
                         headers: {
                             'content-type': 'application/octet-stream',
+                            vary: '__rsc__, __next_router_state_tree__, __next_router_prefetch__',
                         },
                         continue: true,
                         important: true,
                     },
+                    ...appDirVaryRoutes,
                 ]
                 : []),
             // TODO: remove below workaround when `/` is allowed to be output

package/dist/server-build.js

@@ -538,6 +538,34 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
     const dynamicRoutes = await (0, utils_1.getDynamicRoutes)(entryPath, entryDirectory, dynamicPages, false, routesManifest, omittedPrerenderRoutes, canUsePreviewMode, prerenderManifest.bypassToken || '', true, middleware.dynamicRouteMap).then(arr => (0, utils_1.localizeDynamicRoutes)(arr, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, true, isCorrectLocaleAPIRoutes));
     const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await (0, utils_1.getStaticFiles)(entryPath, entryDirectory, outputDirectory);
     const notFoundPreviewRoutes = [];
+    const appDirVaryRoutes = [];
+    // ensure Vary header is set for static app paths
+    // TODO: remove when we are able to set initial headers on Prerender
+    if (appPathRoutesManifest) {
+        for (const route of Object.values(appPathRoutesManifest)) {
+            if (!prerenders[path_1.default.posix.join('.', entryDirectory, route)]) {
+                continue;
+            }
+            let src = path_1.default.posix.join('/', entryDirectory, route);
+            if ((0, utils_1.isDynamicRoute)(route)) {
+                const dynamicRoute = routesManifest.dynamicRoutes.find(r => {
+                    return r.page === route;
+                });
+                if (dynamicRoute &&
+                    'namedRegex' in dynamicRoute &&
+                    dynamicRoute.namedRegex) {
+                    src = src.replace(new RegExp(`${(0, escape_string_regexp_1.default)(route)}$`), dynamicRoute.namedRegex.replace(/^\^/, ''));
+                }
+            }
+            appDirVaryRoutes.push({
+                src,
+                headers: {
+                    vary: '__rsc__, __next_router_state_tree__, __next_router_prefetch__',
+                },
+                continue: true,
+            });
+        }
+    }
     if (prerenderManifest.notFoundRoutes?.length > 0 && canUsePreviewMode) {
         // we combine routes into one src here to reduce the number of needed
         // routes since only the status is being modified and we don't want
@@ -1045,10 +1073,12 @@ async function serverBuild({ dynamicPages, pagesDir, config = {}, privateOutputs
                         src: path_1.default.posix.join('/', entryDirectory, '/(.*).rsc$'),
                         headers: {
                             'content-type': 'application/octet-stream',
+                            vary: '__rsc__, __next_router_state_tree__, __next_router_prefetch__',
                         },
                         continue: true,
                         important: true,
                     },
+                    ...appDirVaryRoutes,
                 ]
                 : []),
             // TODO: remove below workaround when `/` is allowed to be output

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "3.2.5",
+  "version": "3.2.6",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -69,5 +69,5 @@
     "typescript": "4.5.2",
     "webpack-sources": "3.2.3"
   },
-  "gitHead": "40f38948a04d83a9e260ddd455685d74e3eb9209"
+  "gitHead": "dd94dcab3255839c7c9addbba35026dc88cf0e95"
 }