@vercel/next 4.12.4 → 4.12.6

package/dist/index.js

@@ -11364,12 +11364,13 @@ async function getDynamicRoutes({
             routes2.push({
               src: route.src.replace(
                 new RegExp((0, import_escape_string_regexp.default)("(?:/)?$")),
-                shouldSkipSuffixes ? "\\.rsc(?:/)?$" : "(?<rscSuffix>\\.rsc|\\.prefetch\\.rsc|\\.segments/.+\\.segment\\.rsc)(?:/)?$"
-              ),
-              dest: route.dest?.replace(
-                /($|\?)/,
-                shouldSkipSuffixes ? ".rsc$1" : "$rscSuffix$1"
+                // Now than the upstream issues has been resolved, we can safely
+                // add the suffix back, this resolves a bug related to segment
+                // rewrites not capturing the correct suffix values when
+                // enabled.
+                shouldSkipSuffixes ? "(?<rscSuffix>\\.rsc|\\.segments/.+\\.segment\\.rsc)(?:/)?$" : "(?<rscSuffix>\\.rsc|\\.prefetch\\.rsc|\\.segments/.+\\.segment\\.rsc)(?:/)?$"
               ),
+              dest: route.dest?.replace(/($|\?)/, "$rscSuffix$1"),
               check: true,
               override: true
             });
@@ -12094,8 +12095,8 @@ async function getPageLambdaGroups({
       });
       opts = { ...vercelConfigOpts, ...opts };
     }
-    const isGeneratedSteps = routeName.includes("api/generated/steps");
-    const isGeneratedWorkflows = routeName.includes("api/generated/workflows");
+    const isGeneratedSteps = routeName.includes(".well-known/workflow/v1/step") || routeName.includes("api/generated/steps");
+    const isGeneratedWorkflows = routeName.includes(".well-known/workflow/v1/flow") || routeName.includes("api/generated/workflows");
     if (isGeneratedSteps || isGeneratedWorkflows) {
       const sourceFile = await getSourceFilePathFromPage({
         workPath: entryPath,
@@ -12473,7 +12474,8 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   let postponedPrerender;
   let postponedState = null;
   let didPostpone = false;
-  if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && appDir && !isBlocking) {
+  if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && appDir && // TODO(NAR-402): Investigate omitted routes
+  !isBlocking) {
     postponedState = getHTMLPostponedState({ appDir, routeFileNoExt });
     const htmlPath = import_path3.default.join(appDir, `${routeFileNoExt}.html`);
     if (import_fs_extra3.default.existsSync(htmlPath)) {
@@ -12696,7 +12698,8 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       };
     }
     let htmlAllowQuery = allowQuery;
-    if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && (isFallback || isBlocking)) {
+    if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && // TODO(NAR-402): Investigate omitted routes
+    (isFallback || isBlocking)) {
       const { fallbackRootParams, fallback } = isFallback ? prerenderManifest.fallbackRoutes[routeKey] : prerenderManifest.blockingFallbackRoutes[routeKey];
       if (
         // We only want to vary on the shell contents if there is a fallback
@@ -12798,7 +12801,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
           rscContentTypeHeader
         )}`;
         let rdcRSCAllowQuery = allowQuery;
-        if (isAppClientParamParsingEnabled && (isFallback || isBlocking)) {
+        if (isAppClientParamParsingEnabled) {
           rdcRSCAllowQuery = [];
         }
         prerenders[normalizePathData(outputPathData)] = new import_build_utils.Prerender({
@@ -12806,10 +12809,14 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
           staleExpiration: initialExpire,
           lambda,
           allowQuery: rdcRSCAllowQuery,
-          fallback: isFallback ? null : new import_build_utils.FileBlob({
-            data: postponedState,
-            contentType
-          }),
+          fallback: (
+            // Use the fallback value for the RSC route if the route doesn't
+            // vary based on the route parameters.
+            rdcRSCAllowQuery && rdcRSCAllowQuery.length === 0 ? new import_build_utils.FileBlob({
+              data: postponedState,
+              contentType
+            }) : null
+          ),
           group: prerenderGroup,
           bypassToken: prerenderManifest.bypassToken,
           experimentalBypassFor,
@@ -15504,6 +15511,30 @@ ${JSON.stringify(
       // trailing slash
       ...trailingSlashRedirects,
       ...privateOutputs.routes,
+      ...isNextDataServerResolving ? [
+        // ensure x-nextjs-data header is always present
+        // if we are doing middleware next data resolving
+        {
+          src: import_path5.default.posix.join("/", entryDirectory, "/_next/data/(.*)"),
+          missing: [
+            {
+              type: "header",
+              key: "x-nextjs-data"
+            }
+          ],
+          transforms: [
+            {
+              type: "request.headers",
+              op: "append",
+              target: {
+                key: "x-nextjs-data"
+              },
+              args: `1`
+            }
+          ],
+          continue: true
+        }
+      ] : [],
       // normalize _next/data URL before processing redirects
       ...normalizeNextDataRoute(true),
       ...i18n ? [
@@ -18291,10 +18322,20 @@ var diagnostics = async ({
       "trace",
       import_path6.default.join(basePath, diagnosticsEntrypoint, outputDirectory)
     ),
+    // Collect `.next/trace-build` file
+    ...await (0, import_build_utils3.glob)(
+      "trace-build",
+      import_path6.default.join(basePath, diagnosticsEntrypoint, outputDirectory)
+    ),
     // Collect `.next/turbopack` file
     ...await (0, import_build_utils3.glob)(
       "turbopack",
       import_path6.default.join(basePath, diagnosticsEntrypoint, outputDirectory)
+    ),
+    // Collect `.next/trace-turbopack` file
+    ...await (0, import_build_utils3.glob)(
+      "trace-turbopack",
+      import_path6.default.join(basePath, diagnosticsEntrypoint, outputDirectory)
     )
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.12.4",
+  "version": "4.12.6",
   "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": "12.0.0",
+    "@vercel/build-utils": "12.1.0",
     "@vercel/routing-utils": "5.1.1",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",