@vercel/next 4.7.11 → 4.9.0

package/dist/index.js

@@ -1049,14 +1049,26 @@ var require_superstatic = __commonJS({
       }
       return hasItems;
     };
+    function getStringValueForRegex(value) {
+      if (typeof value === "string") {
+        return value;
+      }
+      if (value && typeof value === "object" && value !== null) {
+        if ("re" in value && typeof value.re === "string") {
+          return value.re;
+        }
+      }
+      return null;
+    }
     function collectHasSegments(has) {
       const hasSegments = /* @__PURE__ */ new Set();
       for (const hasItem of has || []) {
         if (!hasItem.value && "key" in hasItem) {
           hasSegments.add(hasItem.key);
         }
-        if (hasItem.value) {
-          for (const match of hasItem.value.matchAll(namedGroupsRegex)) {
+        const stringValue = getStringValueForRegex(hasItem.value);
+        if (stringValue) {
+          for (const match of stringValue.matchAll(namedGroupsRegex)) {
             if (match[1]) {
               hasSegments.add(match[1]);
             }
@@ -11440,7 +11452,7 @@ function getFilesMapFromReasons(fileList, reasons, ignoreFn) {
   }
   return parentFilesMap;
 }
-var collectTracedFiles = (baseDir, lstatResults, lstatSema, reasons, files) => async (file) => {
+var collectTracedFiles = (baseDir, lstatResults, lstatSema, reasons) => async (file) => {
   const reason = reasons.get(file);
   if (reason && reason.type.includes("initial")) {
     return;
@@ -11450,10 +11462,13 @@ var collectTracedFiles = (baseDir, lstatResults, lstatSema, reasons, files) => a
     lstatResults[filePath] = lstatSema.acquire().then(() => (0, import_fs_extra3.lstat)(filePath)).finally(() => lstatSema.release());
   }
   const { mode } = await lstatResults[filePath];
-  files[file] = new import_build_utils.FileFsRef({
-    fsPath: import_path2.default.join(baseDir, file),
-    mode
-  });
+  return [
+    file,
+    new import_build_utils.FileFsRef({
+      fsPath: import_path2.default.join(baseDir, file),
+      mode
+    })
+  ];
 };
 var ExperimentalTraceVersion = `9.0.4-canary.1`;
 async function createPseudoLayer(files) {
@@ -12193,8 +12208,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
-    isAppClientSegmentCacheEnabled,
-    shouldSkipVaryHeader
+    isAppClientSegmentCacheEnabled
   } = prerenderRouteArgs;
   if (isBlocking && isFallback) {
     throw new import_build_utils.NowBuildError({
@@ -12571,7 +12585,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       ...rscEnabled ? {
         initialHeaders: {
           ...initialHeaders,
-          ...shouldSkipVaryHeader ? {} : { vary: rscVaryHeader }
+          vary: rscVaryHeader
         }
       } : {}
     });
@@ -12602,7 +12616,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         ...rscEnabled ? {
           initialHeaders: {
             ...initialHeaders,
-            ...shouldSkipVaryHeader ? {} : { vary: rscVaryHeader },
+            vary: rscVaryHeader,
             ...(outputPathData || outputPathPrefetchData)?.endsWith(
               ".json"
             ) ? {
@@ -12949,11 +12963,12 @@ async function getNodeMiddleware({
     }
   });
   const reasons = /* @__PURE__ */ new Map();
-  const tracedFiles = {};
-  await Promise.all(
-    fileList.map(
-      collectTracedFiles(baseDir, lstatResults, lstatSema, reasons, tracedFiles)
-    )
+  const tracedFiles = Object.fromEntries(
+    (await Promise.all(
+      fileList.map(
+        collectTracedFiles(baseDir, lstatResults, lstatSema, reasons)
+      )
+    )).filter((entry) => !!entry)
   );
   const launcherData = (await import_fs_extra3.default.readFile(import_path2.default.join(__dirname, "middleware-launcher.js"), "utf8")).replace(
     /(?:var|const) conf = __NEXT_CONFIG__/,
@@ -13848,7 +13863,6 @@ 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,
@@ -13915,7 +13929,6 @@ 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) {
@@ -14129,7 +14142,6 @@ async function serverBuild({
   if (hasLambdas) {
     const initialTracingLabel = "Traced Next.js server files in";
     console.time(initialTracingLabel);
-    const initialTracedFiles = {};
     let initialFileList;
     let initialFileReasons;
     let nextServerBuildTrace;
@@ -14216,16 +14228,17 @@ async function serverBuild({
       (0, import_build_utils2.debug)("Using instrumentation.js.nft.json trace from build");
     }
     (0, import_build_utils2.debug)("collecting initial Next.js server files");
-    await Promise.all(
-      initialFileList.map(
-        collectTracedFiles(
-          baseDir,
-          lstatResults,
-          lstatSema,
-          initialFileReasons,
-          initialTracedFiles
+    const initialTracedFiles = Object.fromEntries(
+      (await Promise.all(
+        initialFileList.map(
+          collectTracedFiles(
+            baseDir,
+            lstatResults,
+            lstatSema,
+            initialFileReasons
+          )
         )
-      )
+      )).filter((entry) => !!entry)
     );
     (0, import_build_utils2.debug)("creating initial pseudo layer");
     const initialPseudoLayer = await createPseudoLayer(initialTracedFiles);
@@ -14445,7 +14458,6 @@ ${JSON.stringify(
       console.timeEnd(traceLabel);
     }
     for (const page of mergedPageKeys) {
-      const tracedFiles = {};
       const originalPagePath = getOriginalPagePath(page);
       const pageBuildTrace = getBuildTraceFile(originalPagePath);
       let fileList;
@@ -14498,16 +14510,12 @@ ${JSON.stringify(
         }
         reasons = traceResult?.reasons || /* @__PURE__ */ new Map();
       }
-      await Promise.all(
-        fileList.map(
-          collectTracedFiles(
-            baseDir,
-            lstatResults,
-            lstatSema,
-            reasons,
-            tracedFiles
+      const tracedFiles = Object.fromEntries(
+        (await Promise.all(
+          fileList.map(
+            collectTracedFiles(baseDir, lstatResults, lstatSema, reasons)
           )
-        )
+        )).filter((entry) => !!entry)
       );
       pageTraces[page] = tracedFiles;
       compressedPages[page] = (await createPseudoLayer({
@@ -14888,8 +14896,7 @@ ${JSON.stringify(
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
-    isAppClientSegmentCacheEnabled,
-    shouldSkipVaryHeader
+    isAppClientSegmentCacheEnabled
   });
   await Promise.all(
     Object.keys(prerenderManifest.staticRoutes).map(
@@ -15443,7 +15450,7 @@ ${JSON.stringify(
               entryDirectory,
               `/__index${RSC_PREFETCH_SUFFIX}`
             ),
-            headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
+            headers: { vary: rscVaryHeader },
             continue: true,
             override: true
           },
@@ -15464,7 +15471,7 @@ ${JSON.stringify(
               entryDirectory,
               `/$1${RSC_PREFETCH_SUFFIX}`
             ),
-            headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
+            headers: { vary: rscVaryHeader },
             continue: true,
             override: true
           }
@@ -15478,7 +15485,7 @@ ${JSON.stringify(
             }
           ],
           dest: import_path4.default.posix.join("/", entryDirectory, "/index.rsc"),
-          headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
+          headers: { vary: rscVaryHeader },
           continue: true,
           override: true
         },
@@ -15495,7 +15502,7 @@ ${JSON.stringify(
             }
           ],
           dest: import_path4.default.posix.join("/", entryDirectory, "/$1.rsc"),
-          headers: shouldSkipVaryHeader ? void 0 : { vary: rscVaryHeader },
+          headers: { vary: rscVaryHeader },
           continue: true,
           override: true
         }
@@ -17004,7 +17011,6 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         result.reasons
       );
       for (const page of mergedPageKeys) {
-        const tracedFiles = {};
         const fileList = parentFilesMap.get(
           import_path5.default.relative(baseDir, pages[page].fsPath)
         );
@@ -17014,16 +17020,12 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
           );
         }
         const reasons = result.reasons;
-        await Promise.all(
-          Array.from(fileList).map(
-            collectTracedFiles(
-              baseDir,
-              lstatResults,
-              lstatSema,
-              reasons,
-              tracedFiles
+        const tracedFiles = Object.fromEntries(
+          (await Promise.all(
+            Array.from(fileList).map(
+              collectTracedFiles(baseDir, lstatResults, lstatSema, reasons)
             )
-          )
+          )).filter((entry) => !!entry)
         );
         pageTraces[page] = tracedFiles;
       }
@@ -17517,10 +17519,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       isSharedLambdas,
       canUsePreviewMode,
       isAppPPREnabled: false,
-      isAppClientSegmentCacheEnabled: false,
-      // Relevant Next.js versions will be handled by server-build.ts, which
-      // does correctly configure this variable.
-      shouldSkipVaryHeader: false
+      isAppClientSegmentCacheEnabled: false
     });
     await Promise.all(
       Object.keys(prerenderManifest.staticRoutes).map(

package/package.json

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