@vercel/next 4.7.2 → 4.7.4

package/dist/index.js

@@ -11641,6 +11641,7 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
       }
       routes.forEach((route) => {
         const { initialRevalidateSeconds, dataRoute, srcRoute } = manifest.routes[route];
+        let initialExpireSeconds;
         let initialStatus;
         let initialHeaders;
         let experimentalBypassFor;
@@ -11648,6 +11649,7 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
         let allowHeader;
         let renderingMode;
         if (manifest.version === 4) {
+          initialExpireSeconds = manifest.routes[route].initialExpireSeconds;
           initialStatus = manifest.routes[route].initialStatus;
           initialHeaders = manifest.routes[route].initialHeaders;
           experimentalBypassFor = manifest.routes[route].experimentalBypassFor;
@@ -11660,6 +11662,7 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
         }
         ret.staticRoutes[route] = {
           initialRevalidate: initialRevalidateSeconds === false ? false : Math.max(1, initialRevalidateSeconds),
+          initialExpire: initialExpireSeconds,
           dataRoute,
           prefetchDataRoute,
           srcRoute,
@@ -11679,6 +11682,7 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
         let fallbackHeaders;
         let renderingMode = "STATIC" /* STATIC */;
         let fallbackRevalidate;
+        let fallbackExpire;
         let fallbackRootParams;
         let allowHeader;
         let fallbackSourceRoute;
@@ -11692,6 +11696,7 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
           // using the `experimentalPPR` flag.
           (manifest.dynamicRoutes[lazyRoute].experimentalPPR ? "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ : "STATIC" /* STATIC */);
           fallbackRevalidate = manifest.dynamicRoutes[lazyRoute].fallbackRevalidate;
+          fallbackExpire = manifest.dynamicRoutes[lazyRoute].fallbackExpire;
           fallbackRootParams = manifest.dynamicRoutes[lazyRoute].fallbackRootParams;
           allowHeader = manifest.dynamicRoutes[lazyRoute].allowHeader;
           fallbackSourceRoute = manifest.dynamicRoutes[lazyRoute].fallbackSourceRoute;
@@ -11708,6 +11713,7 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             prefetchDataRoute,
             prefetchDataRouteRegex,
             fallbackRevalidate,
+            fallbackExpire,
             fallbackRootParams,
             fallbackSourceRoute,
             renderingMode,
@@ -12141,7 +12147,8 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
-    isAppClientSegmentCacheEnabled
+    isAppClientSegmentCacheEnabled,
+    shouldSkipVaryHeader
   } = prerenderRouteArgs;
   if (isBlocking && isFallback) {
     throw new import_build_utils.NowBuildError({
@@ -12177,6 +12184,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   }
   const isNotFound = prerenderManifest.notFoundRoutes.includes(routeKey);
   let initialRevalidate;
+  let initialExpire;
   let srcRoute;
   let dataRoute;
   let prefetchDataRoute;
@@ -12212,6 +12220,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     const pr = prerenderManifest.staticRoutes[routeKey];
     ({
       initialRevalidate,
+      initialExpire,
       srcRoute,
       dataRoute,
       initialHeaders,
@@ -12230,6 +12239,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         fallbackStatus,
         fallbackHeaders,
         fallbackRevalidate,
+        fallbackExpire,
         fallbackSourceRoute
       } = prerenderManifest.fallbackRoutes[routeKey];
       if (fallbackStatus) {
@@ -12243,6 +12253,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       }
       if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && typeof fallbackRevalidate !== "undefined") {
         initialRevalidate = fallbackRevalidate;
+        initialExpire = fallbackExpire;
       }
     }
   }
@@ -12491,6 +12502,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     }
     prerenders[outputPathPage] = new import_build_utils.Prerender({
       expiration: initialRevalidate,
+      staleExpiration: initialExpire,
       lambda,
       allowQuery: htmlAllowQuery,
       fallback: htmlFsRef,
@@ -12509,7 +12521,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       ...rscEnabled ? {
         initialHeaders: {
           ...initialHeaders,
-          vary: rscVaryHeader
+          ...shouldSkipVaryHeader ? {} : { vary: rscVaryHeader }
         }
       } : {}
     });
@@ -12526,6 +12538,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       }
       const prerender = new import_build_utils.Prerender({
         expiration: initialRevalidate,
+        staleExpiration: initialExpire,
         lambda,
         allowQuery,
         fallback: jsonFsRef,
@@ -12539,7 +12552,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         ...rscEnabled ? {
           initialHeaders: {
             ...initialHeaders,
-            vary: rscVaryHeader,
+            ...shouldSkipVaryHeader ? {} : { vary: rscVaryHeader },
             ...(outputPathData || outputPathPrefetchData)?.endsWith(
               ".json"
             ) ? {
@@ -12585,6 +12598,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
             }
             prerenders[outputSegmentPath] = new import_build_utils.Prerender({
               expiration: initialRevalidate,
+              staleExpiration: initialExpire,
               lambda,
               allowQuery,
               fallback,
@@ -13784,6 +13798,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,
@@ -13850,6 +13865,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) {
@@ -14813,7 +14829,8 @@ ${JSON.stringify(
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
-    isAppClientSegmentCacheEnabled
+    isAppClientSegmentCacheEnabled,
+    shouldSkipVaryHeader
   });
   await Promise.all(
     Object.keys(prerenderManifest.staticRoutes).map(
@@ -15363,7 +15380,7 @@ ${JSON.stringify(
               entryDirectory,
               `/__index${RSC_PREFETCH_SUFFIX}`
             ),
-            headers: { vary: rscVaryHeader },
+            headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
             continue: true,
             override: true
           },
@@ -15384,7 +15401,7 @@ ${JSON.stringify(
               entryDirectory,
               `/$1${RSC_PREFETCH_SUFFIX}`
             ),
-            headers: { vary: rscVaryHeader },
+            headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
             continue: true,
             override: true
           }
@@ -15398,7 +15415,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
         },
@@ -15415,7 +15432,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
         }
@@ -15977,7 +15994,11 @@ var build = async (buildOptions) => {
     (0, import_build_utils3.debug)("Found NPM_AUTH_TOKEN in environment, creating .npmrc");
     await writeNpmRc(entryPath, process.env.NPM_AUTH_TOKEN);
   }
-  const { detectedPackageManager } = (0, import_build_utils3.detectPackageManager)(cliType, lockfileVersion) ?? {};
+  const { detectedPackageManager } = (0, import_build_utils3.detectPackageManager)(
+    cliType,
+    lockfileVersion,
+    config.projectSettings?.createdAt
+  ) ?? {};
   const trimmedInstallCommand = installCommand?.trim();
   const shouldRunInstallCommand = (
     // Case 1: We have a zero config install
@@ -17432,7 +17453,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.2",
+  "version": "4.7.4",
   "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.1",
+    "@vercel/build-utils": "10.5.1",
     "@vercel/routing-utils": "5.0.4",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",