@vercel/next 4.7.3 → 4.7.6

package/dist/index.js

@@ -11728,7 +11728,8 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             prefetchDataRoute,
             prefetchDataRouteRegex,
             renderingMode,
-            allowHeader
+            allowHeader,
+            fallbackRootParams
           };
         } else {
           ret.omittedRoutes[lazyRoute] = {
@@ -12147,7 +12148,8 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
-    isAppClientSegmentCacheEnabled
+    isAppClientSegmentCacheEnabled,
+    shouldSkipVaryHeader
   } = prerenderRouteArgs;
   if (isBlocking && isFallback) {
     throw new import_build_utils.NowBuildError({
@@ -12495,8 +12497,8 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       };
     }
     let htmlAllowQuery = allowQuery;
-    if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && isFallback) {
-      const { fallbackRootParams } = prerenderManifest.fallbackRoutes[routeKey];
+    if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && (isFallback || isBlocking)) {
+      const { fallbackRootParams } = isFallback ? prerenderManifest.fallbackRoutes[routeKey] : prerenderManifest.blockingFallbackRoutes[routeKey];
       htmlAllowQuery = fallbackRootParams ?? [];
     }
     prerenders[outputPathPage] = new import_build_utils.Prerender({
@@ -12520,7 +12522,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       ...rscEnabled ? {
         initialHeaders: {
           ...initialHeaders,
-          vary: rscVaryHeader
+          ...shouldSkipVaryHeader ? {} : { vary: rscVaryHeader }
         }
       } : {}
     });
@@ -12551,7 +12553,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         ...rscEnabled ? {
           initialHeaders: {
             ...initialHeaders,
-            vary: rscVaryHeader,
+            ...shouldSkipVaryHeader ? {} : { vary: rscVaryHeader },
             ...(outputPathData || outputPathPrefetchData)?.endsWith(
               ".json"
             ) ? {
@@ -12576,7 +12578,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     if (isAppClientSegmentCacheEnabled && prefetchSegmentSuffix && prefetchSegmentDirSuffix && rscDidPostponeHeader && appDir) {
       const metaPath = import_path2.default.join(appDir, `${routeFileNoExt}.meta`);
       if (import_fs_extra3.default.existsSync(metaPath)) {
-        const meta = JSON.parse(await import_fs_extra3.default.readFile(metaPath, "utf8"));
+        const meta = JSON.parse(import_fs_extra3.default.readFileSync(metaPath, "utf8"));
         if (typeof meta === "object" && meta !== null && "segmentPaths" in meta && typeof meta.segmentPaths === "object" && meta.segmentPaths !== null && Array.isArray(meta.segmentPaths)) {
           const segmentsDir = import_path2.default.join(
             appDir,
@@ -12629,7 +12631,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       prerenders[rscKey] = dummyOutput;
       prerenders[prefetchRscKey] = dummyOutput;
     }
-    ++prerenderGroup;
+    prerenderGroup++;
     if (routesManifest?.i18n && isBlocking) {
       for (const locale2 of routesManifest.i18n.locales) {
         const localeRouteFileNoExt = addLocaleOrDefault(
@@ -12663,7 +12665,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
             group: prerenderGroup
           };
         }
-        ++prerenderGroup;
+        prerenderGroup++;
       }
     }
   }
@@ -13797,6 +13799,7 @@ var PRELOAD_CHUNKS = {
 };
 var BUNDLED_SERVER_NEXT_VERSION = "v13.5.4";
 var BUNDLED_SERVER_NEXT_PATH = "next/dist/compiled/next-server/server.runtime.prod.js";
+var NEXT_VARY_INERT_VERSION = "v13.4.6";
 async function serverBuild({
   dynamicPages,
   pagesDir,
@@ -13863,6 +13866,7 @@ async function serverBuild({
     nextVersion,
     EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION
   );
+  const shouldSkipVaryHeader = import_semver3.default.gte(nextVersion, NEXT_VARY_INERT_VERSION);
   const projectDir = requiredServerFilesManifest.relativeAppDir ? import_path4.default.join(baseDir, requiredServerFilesManifest.relativeAppDir) : requiredServerFilesManifest.appDir || entryPath;
   const inversedAppPathManifest = {};
   if (appPathRoutesManifest) {
@@ -14826,7 +14830,8 @@ ${JSON.stringify(
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
-    isAppClientSegmentCacheEnabled
+    isAppClientSegmentCacheEnabled,
+    shouldSkipVaryHeader
   });
   await Promise.all(
     Object.keys(prerenderManifest.staticRoutes).map(
@@ -15376,7 +15381,7 @@ ${JSON.stringify(
               entryDirectory,
               `/__index${RSC_PREFETCH_SUFFIX}`
             ),
-            headers: { vary: rscVaryHeader },
+            headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
             continue: true,
             override: true
           },
@@ -15397,7 +15402,7 @@ ${JSON.stringify(
               entryDirectory,
               `/$1${RSC_PREFETCH_SUFFIX}`
             ),
-            headers: { vary: rscVaryHeader },
+            headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
             continue: true,
             override: true
           }
@@ -15411,7 +15416,7 @@ ${JSON.stringify(
             }
           ],
           dest: import_path4.default.posix.join("/", entryDirectory, "/index.rsc"),
-          headers: { vary: rscVaryHeader },
+          headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
           continue: true,
           override: true
         },
@@ -15428,7 +15433,7 @@ ${JSON.stringify(
             }
           ],
           dest: import_path4.default.posix.join("/", entryDirectory, "/$1.rsc"),
-          headers: { vary: rscVaryHeader },
+          headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
           continue: true,
           override: true
         }
@@ -17449,7 +17454,10 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       isSharedLambdas,
       canUsePreviewMode,
       isAppPPREnabled: false,
-      isAppClientSegmentCacheEnabled: false
+      isAppClientSegmentCacheEnabled: false,
+      // Relevant Next.js versions will be handled by server-build.ts, which
+      // does correctly configure this variable.
+      shouldSkipVaryHeader: false
     });
     await Promise.all(
       Object.keys(prerenderManifest.staticRoutes).map(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.7.3",
+  "version": "4.7.6",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -30,7 +30,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "10.3.2",
+    "@vercel/build-utils": "10.5.1",
     "@vercel/routing-utils": "5.0.4",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",