@vercel/next 4.10.10 → 4.11.0

package/dist/index.js

@@ -11162,6 +11162,14 @@ async function getDynamicRoutes({
       case 3:
       case 4: {
         const routes2 = [];
+        if (isAppClientSegmentCacheEnabled && !isAppPPREnabled) {
+          routes2.push({
+            src: "^/(?<path>.+)(?<rscSuffix>\\.segments/.+\\.segment\\.rsc)(?:/)?$",
+            dest: `/$path${isAppPPREnabled ? ".prefetch.rsc" : ".rsc"}`,
+            check: true,
+            override: true
+          });
+        }
         for (const dynamicRoute of routesManifest.dynamicRoutes) {
           if (!canUsePreviewMode && omittedRoutes?.has(dynamicRoute.page)) {
             continue;
@@ -11182,7 +11190,8 @@ async function getDynamicRoutes({
             namedRegex,
             regex,
             routeKeys,
-            prefetchSegmentDataRoutes
+            prefetchSegmentDataRoutes,
+            hasFallbackRootParams
           } = params;
           const route = {
             src: namedRegex || regex,
@@ -11191,6 +11200,10 @@ async function getDynamicRoutes({
           if (!isServerMode) {
             route.check = true;
           }
+          if (isAppPPREnabled || isAppClientSegmentCacheEnabled) {
+            route.check = true;
+            route.override = true;
+          }
           if (isServerMode && canUsePreviewMode && omittedRoutes?.has(page)) {
             route.has = [
               {
@@ -11207,7 +11220,6 @@ async function getDynamicRoutes({
           if (isAppClientSegmentCacheEnabled && prefetchSegmentDataRoutes && prefetchSegmentDataRoutes.length > 0) {
             for (const prefetchSegmentDataRoute of prefetchSegmentDataRoutes) {
               routes2.push({
-                ...route,
                 src: prefetchSegmentDataRoute.source,
                 dest: getDestinationForSegmentRoute(
                   isDev === true,
@@ -11215,18 +11227,23 @@ async function getDynamicRoutes({
                   routeKeys,
                   prefetchSegmentDataRoute
                 ),
-                check: true
+                check: true,
+                override: true
               });
             }
           }
           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)(?:/)?$"
+                hasFallbackRootParams ? "\\.rsc(?:/)?$" : "(?<rscSuffix>\\.rsc|\\.prefetch\\.rsc|\\.segments/.+\\.segment\\.rsc)(?:/)?$"
+              ),
+              dest: route.dest?.replace(
+                /($|\?)/,
+                hasFallbackRootParams ? ".rsc$1" : "$rscSuffix$1"
               ),
-              dest: route.dest?.replace(/($|\?)/, "$rscSuffix$1")
+              check: true,
+              override: true
             });
           } else {
             routes2.push({
@@ -11621,7 +11638,13 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
         };
       });
       lazyRoutes.forEach((lazyRoute) => {
-        const { routeRegex, fallback, dataRoute, dataRouteRegex } = manifest.dynamicRoutes[lazyRoute];
+        const {
+          routeRegex,
+          fallback,
+          dataRoute,
+          dataRouteRegex,
+          fallbackRootParams
+        } = manifest.dynamicRoutes[lazyRoute];
         if (fallback) {
           ret.fallbackRoutes[lazyRoute] = {
             routeRegex,
@@ -11635,6 +11658,8 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
           ret.blockingFallbackRoutes[lazyRoute] = {
             routeRegex,
             dataRoute,
+            fallback: null,
+            fallbackRootParams,
             dataRouteRegex,
             renderingMode: "STATIC" /* STATIC */,
             allowHeader: void 0
@@ -11750,7 +11775,8 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             prefetchDataRouteRegex,
             renderingMode,
             allowHeader,
-            fallbackRootParams
+            fallbackRootParams,
+            fallback: null
           };
         } else {
           ret.omittedRoutes[lazyRoute] = {
@@ -12519,8 +12545,8 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     }
     let htmlAllowQuery = allowQuery;
     if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && (isFallback || isBlocking)) {
-      const { fallbackRootParams } = isFallback ? prerenderManifest.fallbackRoutes[routeKey] : prerenderManifest.blockingFallbackRoutes[routeKey];
-      if (fallbackRootParams && fallbackRootParams.length > 0) {
+      const { fallbackRootParams, fallback } = isFallback ? prerenderManifest.fallbackRoutes[routeKey] : prerenderManifest.blockingFallbackRoutes[routeKey];
+      if (fallback && typeof fallback === "string" && fallbackRootParams && fallbackRootParams.length > 0) {
         htmlAllowQuery = fallbackRootParams;
       } else if (postponedPrerender) {
         htmlAllowQuery = [];
@@ -15165,6 +15191,9 @@ ${JSON.stringify(
       lambdas[dataPathname] = lambdas[srcPathname];
     }
   }
+  const shouldHandleSegmentToRsc = Boolean(
+    isAppClientSegmentCacheEnabled && rscPrefetchHeader && prefetchSegmentHeader && prefetchSegmentDirSuffix && prefetchSegmentSuffix
+  );
   return {
     wildcard: wildcardConfig,
     images: getImagesConfig(imagesManifest),
@@ -15646,19 +15675,11 @@ ${JSON.stringify(
         }
       ] : [],
       // 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 ? [
+      // should fallback to either prefetch or normal RSC request
+      ...shouldHandleSegmentToRsc && 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"
-          ),
+          src: "^/(?<path>.+)(?<rscSuffix>\\.segments/.+\\.segment\\.rsc)(?:/)?$",
+          dest: `/$path${isAppPPREnabled ? ".prefetch.rsc" : ".rsc"}`,
           check: true
         }
       ] : [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.10.10",
+  "version": "4.11.0",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",