@vercel/next 4.15.18 → 4.15.20

package/dist/index.js

@@ -12657,7 +12657,9 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     });
   }
   let dataFallbackFsRef = null;
-  if (!isFallback && !isBlocking && (!isNotFound || static404Page) && dataRoute && (!isAppClientParamParsingEnabled || prefetchDataRoute)) {
+  if (!isFallback && !isBlocking && (!isNotFound || static404Page) && dataRoute && // When this is an App route, either isAppClientParamParsingEnabled is disabled
+  // or there's a prefetchDataRoute
+  (!isAppPathRoute || !isAppClientParamParsingEnabled || prefetchDataRoute)) {
     const basePath = isAppPathRoute && !isOmittedOrNotFound && appDir ? appDir : pagesDir;
     dataFallbackFsRef = new import_build_utils.FileFsRef({
       fsPath: import_path3.default.join(
@@ -12922,44 +12924,49 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       if (outputPathData && renderingMode !== "PARTIALLY_STATIC" /* PARTIALLY_STATIC */) {
         prerenders[normalizePathData(outputPathData)] = prerender;
       } else if (outputPathData && routesManifest?.rsc?.dynamicRSCPrerender && routesManifest?.ppr?.chain?.headers) {
-        let contentType = rscContentTypeHeader;
-        if (postponedState) {
-          contentType = `application/x-nextjs-pre-render; state-length=${postponedState.length}; origin=${JSON.stringify(
-            rscContentTypeHeader
-          )}`;
-        }
-        const rdcRSCAllowQuery = isAppClientParamParsingEnabled ? htmlAllowQuery : allowQuery;
-        let fallback = null;
-        if (rdcRSCAllowQuery && rdcRSCAllowQuery.length === 0 && postponedState) {
-          fallback = new import_build_utils.FileBlob({
-            data: postponedState,
-            contentType
+        const shouldSkipDynamicRsc = Boolean(prefetchDataRoute) && !postponedState;
+        if (shouldSkipDynamicRsc) {
+          prerenders[normalizePathData(outputPathData)] = prerender;
+        } else {
+          let contentType = rscContentTypeHeader;
+          if (postponedState) {
+            contentType = `application/x-nextjs-pre-render; state-length=${postponedState.length}; origin=${JSON.stringify(
+              rscContentTypeHeader
+            )}`;
+          }
+          const rdcRSCAllowQuery = isAppClientParamParsingEnabled ? htmlAllowQuery : allowQuery;
+          let fallback = null;
+          if (rdcRSCAllowQuery && rdcRSCAllowQuery.length === 0 && postponedState) {
+            fallback = new import_build_utils.FileBlob({
+              data: postponedState,
+              contentType
+            });
+          }
+          prerenders[normalizePathData(outputPathData)] = new import_build_utils.Prerender({
+            expiration: initialRevalidate,
+            staleExpiration: initialExpire,
+            lambda,
+            allowQuery: rdcRSCAllowQuery,
+            fallback,
+            group: prerenderGroup,
+            bypassToken: prerenderManifest.bypassToken,
+            experimentalBypassFor,
+            allowHeader,
+            chain: {
+              outputPath: normalizePathData(outputPathData),
+              headers: routesManifest.ppr.chain.headers
+            },
+            ...isNotFound ? { initialStatus: 404 } : {},
+            initialHeaders: {
+              ...initialHeaders,
+              "content-type": contentType,
+              // Dynamic RSC requests cannot be cached, so we explicity set it
+              // here to ensure that the response is not cached by the browser.
+              "cache-control": "private, no-store, no-cache, max-age=0, must-revalidate",
+              vary: rscVaryHeader
+            }
           });
         }
-        prerenders[normalizePathData(outputPathData)] = new import_build_utils.Prerender({
-          expiration: initialRevalidate,
-          staleExpiration: initialExpire,
-          lambda,
-          allowQuery: rdcRSCAllowQuery,
-          fallback,
-          group: prerenderGroup,
-          bypassToken: prerenderManifest.bypassToken,
-          experimentalBypassFor,
-          allowHeader,
-          chain: {
-            outputPath: normalizePathData(outputPathData),
-            headers: routesManifest.ppr.chain.headers
-          },
-          ...isNotFound ? { initialStatus: 404 } : {},
-          initialHeaders: {
-            ...initialHeaders,
-            "content-type": contentType,
-            // Dynamic RSC requests cannot be cached, so we explicity set it
-            // here to ensure that the response is not cached by the browser.
-            "cache-control": "private, no-store, no-cache, max-age=0, must-revalidate",
-            vary: rscVaryHeader
-          }
-        });
       }
     }
     const prefetchSegmentSuffix = routesManifest?.rsc?.prefetchSegmentSuffix;

package/package.json

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