@vercel/next 4.10.6 → 4.10.8

package/dist/index.js

@@ -11124,42 +11124,12 @@ async function getRoutesManifest(entryPath, outputDirectory, nextVersion) {
   }
   return routesManifest;
 }
-async function getStaticSegmentRoutes({
-  entryDirectory,
-  routesManifest
-}) {
-  switch (routesManifest.version) {
-    case 3:
-    case 4: {
-      const routes = [];
-      for (const {
-        routeKeys,
-        prefetchSegmentDataRoutes
-      } of routesManifest.staticRoutes) {
-        if (prefetchSegmentDataRoutes && prefetchSegmentDataRoutes.length > 0) {
-          for (const prefetchSegmentDataRoute of prefetchSegmentDataRoutes) {
-            routes.push({
-              src: prefetchSegmentDataRoute.source,
-              dest: getDestinationForSegmentRoute(
-                false,
-                entryDirectory,
-                routeKeys,
-                prefetchSegmentDataRoute
-              ),
-              check: true
-            });
-          }
-        }
-      }
-      return routes;
-    }
-    default: {
-      throw new import_build_utils.NowBuildError({
-        message: "This version of `@vercel/next` does not support the version of Next.js you are trying to deploy.\nPlease upgrade your `@vercel/next` builder and try again. Contact support if this continues to happen.",
-        code: "NEXT_VERSION_UPGRADE"
-      });
-    }
-  }
+function getDestinationForSegmentRoute(isDev, entryDirectory, routeKeys, prefetchSegmentDataRoute) {
+  return `${!isDev ? import_path2.default.posix.join(
+    "/",
+    entryDirectory,
+    prefetchSegmentDataRoute.destination
+  ) : prefetchSegmentDataRoute.destination}?${Object.entries(prefetchSegmentDataRoute.routeKeys ?? routeKeys ?? {}).map(([key, value]) => `${value}=$${key}`).join("&")}`;
 }
 async function getDynamicRoutes({
   entryPath,
@@ -11248,28 +11218,25 @@ async function getDynamicRoutes({
               });
             }
           }
-          if (isAppPPREnabled) {
-            let dest = route.dest?.replace(/($|\?)/, ".prefetch.rsc$1");
-            if (page === "/" || page === "/index") {
-              dest = dest?.replace(/([^/]+\.prefetch\.rsc(\?.*|$))/, "__$1");
-            }
+          if (isAppPPREnabled || isAppClientSegmentCacheEnabled) {
+            routes2.push({
+              ...route,
+              src: route.src.replace(
+                new RegExp((0, import_escape_string_regexp.default)("(?:/)?$")),
+                "(?<rscSuffix>\\.rsc|\\.prefetch\\.rsc|\\.segments/.+\\.segment\\.rsc)(?:/)?$"
+              ),
+              dest: route.dest?.replace(/($|\?)/, "$rscSuffix$1")
+            });
+          } else {
             routes2.push({
               ...route,
               src: route.src.replace(
                 new RegExp((0, import_escape_string_regexp.default)("(?:/)?$")),
-                "(?:\\.prefetch\\.rsc)(?:/)?$"
+                "(?:\\.rsc)(?:/)?$"
               ),
-              dest
+              dest: route.dest?.replace(/($|\?)/, ".rsc$1")
             });
           }
-          routes2.push({
-            ...route,
-            src: route.src.replace(
-              new RegExp((0, import_escape_string_regexp.default)("(?:/)?$")),
-              "(?:\\.rsc)(?:/)?$"
-            ),
-            dest: route.dest?.replace(/($|\?)/, ".rsc$1")
-          });
           routes2.push(route);
         }
         return routes2;
@@ -11333,13 +11300,6 @@ async function getDynamicRoutes({
   });
   return routes;
 }
-function getDestinationForSegmentRoute(isDev, entryDirectory, routeKeys, prefetchSegmentDataRoute) {
-  return `${!isDev ? import_path2.default.posix.join(
-    "/",
-    entryDirectory,
-    prefetchSegmentDataRoute.destination
-  ) : prefetchSegmentDataRoute.destination}?${Object.entries(prefetchSegmentDataRoute.routeKeys ?? routeKeys ?? {}).map(([key, value]) => `${value}=$${key}`).join("&")}`;
-}
 function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes, inversedAppPathRoutesManifest) {
   const finalDynamicRoutes = [];
   const nonLocalePrefixedRoutes = [];
@@ -13000,19 +12960,17 @@ async function getNodeMiddleware({
       )
     )).filter((entry) => !!entry)
   );
+  const absoluteOutputDirectory = import_path2.default.posix.join(entryPath, outputDirectory);
   const launcherData = (await import_fs_extra3.default.readFile(import_path2.default.join(__dirname, "middleware-launcher.js"), "utf8")).replace(
     /(?:var|const) conf = __NEXT_CONFIG__/,
     `const conf = ${JSON.stringify({
       ...requiredServerFilesManifest.config,
-      distDir: import_path2.default.relative(
-        projectDir,
-        import_path2.default.join(entryPath, outputDirectory)
-      )
+      distDir: import_path2.default.relative(projectDir, absoluteOutputDirectory)
     })}`
   ).replace(
     "__NEXT_MIDDLEWARE_PATH__",
     "./" + import_path2.default.posix.join(
-      import_path2.default.posix.relative(projectDir, outputDirectory),
+      import_path2.default.posix.relative(projectDir, absoluteOutputDirectory),
       `server/middleware.js`
     )
   );
@@ -14056,64 +14014,15 @@ async function serverBuild({
           continue;
         if (protocol || !pathname && !query)
           continue;
-        const missing = "missing" in rewrite && rewrite.missing ? rewrite.missing : [];
-        let found = missing.filter(
-          (h) => h.type === "header" && h.key.toLowerCase() === rscHeader
-        );
-        if (found.some(
-          (m) => (
-            // These are rules that don't have a value check or those that
-            // have their value set to '1'.
-            !m.value || m.value === "1"
-          )
-        )) {
-          continue;
-        }
-        const has = "has" in rewrite && rewrite.has ? (
-          // As we mutate the array below, we need to clone it to avoid
-          // mutating the original
-          [...rewrite.has]
-        ) : [];
-        found = has.filter(
-          (h) => h.type === "header" && h.key.toLowerCase() === rscHeader
-        );
-        if (found.some(
-          (h) => (
-            // These are rules that have a value set to anything other than
-            // '1'.
-            h.value && h.value !== "1"
-          )
-        )) {
-          continue;
-        }
-        for (const h of found) {
-          has.splice(has.indexOf(h), 1);
-        }
-        has.push({ type: "header", key: rscHeader, value: "1" });
-        const headers2 = "headers" in rewrite && rewrite.headers ? (
-          // Clone the existing headers to avoid mutating the original
-          // object.
-          { ...rewrite.headers }
-        ) : {};
-        const updated = {
-          ...rewrite,
-          // We don't want to perform the actual rewrite here, instead we want
-          // to just add the headers associated with the rewrite.
-          dest: void 0,
-          // We don't want to check here, so omit the check property but we do
-          // want to maintain the order of the rewrites, so add the continue
-          // property.
-          check: void 0,
-          continue: true,
-          has,
-          headers: headers2
+        rewrite.headers = {
+          ...rewrite.headers,
+          ...pathname ? {
+            [rewriteHeaders.pathHeader]: pathname
+          } : {},
+          ...query ? {
+            [rewriteHeaders.queryHeader]: query
+          } : {}
         };
-        if (pathname)
-          headers2[rewriteHeaders.pathHeader] = pathname;
-        if (query)
-          headers2[rewriteHeaders.queryHeader] = query;
-        rewrites.splice(i, 0, updated);
-        i++;
       }
     };
     modifyRewrites(beforeFilesRewrites);
@@ -15068,10 +14977,6 @@ ${JSON.stringify(
     )];
   });
   const isNextDataServerResolving = (middleware.staticRoutes.length > 0 || nodeMiddleware) && import_semver3.default.gte(nextVersion, NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION);
-  const staticSegmentRoutes = isAppClientSegmentCacheEnabled ? await getStaticSegmentRoutes({
-    entryDirectory,
-    routesManifest
-  }) : [];
   const dynamicRoutes = await getDynamicRoutes({
     entryPath,
     entryDirectory,
@@ -15109,10 +15014,14 @@ ${JSON.stringify(
     const pagesEntries = Object.keys(pagesData);
     for (const page of pagesEntries) {
       const pathName = page.startsWith("/") ? page.slice(1) : page;
-      pagesPlaceholderRscEntries[`${pathName}.rsc`] = new import_build_utils2.FileBlob({
+      const dummyBlob = new import_build_utils2.FileBlob({
         data: "{}",
         contentType: "application/json"
       });
+      pagesPlaceholderRscEntries[`${pathName}.rsc`] = dummyBlob;
+      if (isAppClientSegmentCacheEnabled) {
+        pagesPlaceholderRscEntries[`${pathName}.segments/_tree.segment.rsc`] = dummyBlob;
+      }
     }
   }
   const { staticFiles, publicDirectoryFiles, staticDirectoryFiles } = await getStaticFiles(entryPath, entryDirectory, outputDirectory);
@@ -15515,7 +15424,9 @@ ${JSON.stringify(
             override: true
           }
         ] : [],
-        ...rscPrefetchHeader && isAppPPREnabled ? [
+        ...rscPrefetchHeader && isAppPPREnabled && // when client segment cache is enabled we do not need
+        // the .prefetch.rsc routing
+        !isAppClientSegmentCacheEnabled ? [
           {
             src: `^${import_path4.default.posix.join("/", entryDirectory, "/")}$`,
             has: [
@@ -15727,6 +15638,23 @@ ${JSON.stringify(
           check: true
         }
       ] : [],
+      // If it didn't match any of the static routes or dynamic ones, then we
+      // should fallback to the regular RSC request.
+      ...isAppClientSegmentCacheEnabled && rscPrefetchHeader && prefetchSegmentHeader && prefetchSegmentDirSuffix && prefetchSegmentSuffix ? [
+        {
+          src: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            `/(?<path>.+)${(0, import_escape_string_regexp2.default)(prefetchSegmentDirSuffix)}/.+${(0, import_escape_string_regexp2.default)(prefetchSegmentSuffix)}$`
+          ),
+          dest: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            isAppPPREnabled ? "/$path.prefetch.rsc" : "/$path.rsc"
+          ),
+          check: true
+        }
+      ] : [],
       // routes that are called after each rewrite or after routes
       // if there no rewrites
       { handle: "rewrite" },
@@ -15798,7 +15726,6 @@ ${JSON.stringify(
           status: 404
         }
       ] : [],
-      ...staticSegmentRoutes,
       // Dynamic routes (must come after dataRoutes as dataRoutes are more
       // specific)
       ...dynamicRoutes,
@@ -15830,23 +15757,6 @@ ${JSON.stringify(
           dest: "__next_data_catchall"
         }
       ] : [],
-      // If it didn't match any of the static routes or dynamic ones, then we
-      // should fallback to the regular RSC request.
-      ...isAppClientSegmentCacheEnabled && rscPrefetchHeader && prefetchSegmentHeader && prefetchSegmentDirSuffix && prefetchSegmentSuffix ? [
-        {
-          src: import_path4.default.posix.join(
-            "/",
-            entryDirectory,
-            `/(?<path>.+)${(0, import_escape_string_regexp2.default)(prefetchSegmentDirSuffix)}/.+${(0, import_escape_string_regexp2.default)(prefetchSegmentSuffix)}$`
-          ),
-          dest: import_path4.default.posix.join(
-            "/",
-            entryDirectory,
-            isAppPPREnabled ? "/$path.prefetch.rsc" : "/$path.rsc"
-          ),
-          check: true
-        }
-      ] : [],
       // routes to call after a file has been matched
       { handle: "hit" },
       // Before we handle static files we need to set proper caching headers
@@ -17390,8 +17300,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       canUsePreviewMode,
       bypassToken: prerenderManifest.bypassToken || "",
       isServerMode,
-      isAppPPREnabled: false,
-      isAppClientSegmentCacheEnabled: false
+      isAppPPREnabled: false
     }).then(
       (arr) => localizeDynamicRoutes(
         arr,
@@ -17417,8 +17326,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         canUsePreviewMode,
         bypassToken: prerenderManifest.bypassToken || "",
         isServerMode,
-        isAppPPREnabled: false,
-        isAppClientSegmentCacheEnabled: false
+        isAppPPREnabled: false
       }).then(
         (arr) => arr.map((route) => {
           route.src = route.src.replace("^", `^${dynamicPrefix}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.10.6",
+  "version": "4.10.8",
   "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.6.7",
+    "@vercel/build-utils": "11.0.0",
     "@vercel/routing-utils": "5.1.1",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",