@vercel/next 4.3.6 → 4.3.8

package/dist/index.js

@@ -10682,7 +10682,6 @@ async function getDynamicRoutes({
   bypassToken,
   isServerMode,
   dynamicMiddlewareRouteMap,
-  hasActionOutputSupport,
   isAppPPREnabled
 }) {
   if (routesManifest) {
@@ -10751,25 +10750,14 @@ async function getDynamicRoutes({
               dest
             });
           }
-          if (hasActionOutputSupport) {
-            routes2.push({
-              ...route,
-              src: route.src.replace(
-                new RegExp((0, import_escape_string_regexp.default)("(?:/)?$")),
-                "(?<nxtsuffix>(?:\\.action|\\.rsc))(?:/)?$"
-              ),
-              dest: route.dest?.replace(/($|\?)/, "$nxtsuffix$1")
-            });
-          } else {
-            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,
+            src: route.src.replace(
+              new RegExp((0, import_escape_string_regexp.default)("(?:/)?$")),
+              "(?:\\.rsc)(?:/)?$"
+            ),
+            dest: route.dest?.replace(/($|\?)/, ".rsc$1")
+          });
           routes2.push(route);
         }
         return routes2;
@@ -11196,11 +11184,15 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
         let experimentalPPR;
         let prefetchDataRoute;
         let prefetchDataRouteRegex;
+        let fallbackStatus;
+        let fallbackHeaders;
         if (manifest.version === 4) {
           experimentalBypassFor = manifest.dynamicRoutes[lazyRoute].experimentalBypassFor;
           experimentalPPR = manifest.dynamicRoutes[lazyRoute].experimentalPPR;
           prefetchDataRoute = manifest.dynamicRoutes[lazyRoute].prefetchDataRoute;
           prefetchDataRouteRegex = manifest.dynamicRoutes[lazyRoute].prefetchDataRouteRegex;
+          fallbackStatus = manifest.dynamicRoutes[lazyRoute].fallbackStatus;
+          fallbackHeaders = manifest.dynamicRoutes[lazyRoute].fallbackHeaders;
         }
         if (typeof fallback === "string") {
           ret.fallbackRoutes[lazyRoute] = {
@@ -11208,6 +11200,8 @@ async function getPrerenderManifest(entryPath, outputDirectory) {
             experimentalPPR,
             routeRegex,
             fallback,
+            fallbackStatus,
+            fallbackHeaders,
             dataRoute,
             dataRouteRegex,
             prefetchDataRoute,
@@ -11635,8 +11629,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     routesManifest,
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
-    isAppPPREnabled,
-    hasActionOutputSupport
+    isAppPPREnabled
   } = prerenderRouteArgs;
   if (isBlocking && isFallback) {
     throw new import_build_utils.NowBuildError({
@@ -11716,6 +11709,15 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   let isAppPathRoute = false;
   if (appDir && experimentalPPR) {
     isAppPathRoute = true;
+    if (isFallback) {
+      const { fallbackStatus, fallbackHeaders } = prerenderManifest.fallbackRoutes[routeKey];
+      if (fallbackStatus) {
+        initialStatus = fallbackStatus;
+      }
+      if (fallbackHeaders) {
+        initialHeaders = fallbackHeaders;
+      }
+    }
   }
   if (appDir && srcRoute && (!dataRoute || dataRoute?.endsWith(".rsc"))) {
     isAppPathRoute = true;
@@ -11964,12 +11966,6 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         }
       } : {}
     });
-    if (hasActionOutputSupport) {
-      const actionOutputKey = `${import_path2.default.join("./", srcRoute || "")}.action`;
-      if (srcRoute !== routeKey && lambdas[actionOutputKey]) {
-        lambdas[`${routeKey}.action`] = lambdas[actionOutputKey];
-      }
-    }
     const normalizePathData = (pathData) => {
       if ((srcRoute === "/" || srcRoute == "/index") && pathData.endsWith(RSC_PREFETCH_SUFFIX)) {
         delete lambdas[pathData];
@@ -12001,7 +11997,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
             ...isAppPathRoute ? {
               "content-type": rscContentTypeHeader
             } : {},
-            ...postponedPrerender && rscDidPostponeHeader ? { [rscDidPostponeHeader]: "1" } : {}
+            ...postponedPrerender && rscDidPostponeHeader && !isFallback ? { [rscDidPostponeHeader]: "1" } : {}
           }
         } : {}
       });
@@ -12557,9 +12553,7 @@ async function getVariantsManifest(entryPath, outputDirectory) {
   const hasVariantsManifest = await import_fs_extra3.default.access(pathVariantsManifest).then(() => true).catch(() => false);
   if (!hasVariantsManifest)
     return null;
-  const variantsManifest = await import_fs_extra3.default.readJSON(
-    pathVariantsManifest
-  );
+  const variantsManifest = await import_fs_extra3.default.readJSON(pathVariantsManifest);
   return variantsManifest;
 }
 async function getServerlessPages(params) {
@@ -13042,7 +13036,6 @@ var CORRECT_NOT_FOUND_ROUTES_VERSION = "v12.0.1";
 var CORRECT_MIDDLEWARE_ORDER_VERSION = "v12.1.7-canary.29";
 var NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = "v12.1.7-canary.33";
 var EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = "v12.2.0";
-var ACTION_OUTPUT_SUPPORT_VERSION = "v14.2.2";
 var CORRECTED_MANIFESTS_VERSION = "v12.2.0";
 var PRELOAD_CHUNKS = {
   APP_ROUTER_PAGES: [
@@ -13129,7 +13122,6 @@ async function serverBuild({
     nextVersion,
     EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION
   );
-  const hasActionOutputSupport = import_semver3.default.gte(nextVersion, ACTION_OUTPUT_SUPPORT_VERSION) && Boolean(process.env.NEXT_EXPERIMENTAL_STREAMING_ACTIONS) && !routesManifest.i18n;
   const projectDir = requiredServerFilesManifest.relativeAppDir ? import_path4.default.join(baseDir, requiredServerFilesManifest.relativeAppDir) : requiredServerFilesManifest.appDir || entryPath;
   const inversedAppPathManifest = {};
   if (appPathRoutesManifest) {
@@ -13153,7 +13145,7 @@ async function serverBuild({
     }
     for (const rewrite of afterFilesRewrites) {
       if (rewrite.src && rewrite.dest) {
-        const rscSuffix = isAppPPREnabled ? `(\\.prefetch)?\\.rsc${hasActionOutputSupport ? "|\\.action" : ""}` : hasActionOutputSupport ? "(\\.action|\\.rsc)" : "\\.rsc";
+        const rscSuffix = isAppPPREnabled ? `(\\.prefetch)?\\.rsc` : "\\.rsc";
         rewrite.src = rewrite.src.replace(
           /\/?\(\?:\/\)\?/,
           `(?<rscsuff>${rscSuffix})?(?:/)?`
@@ -13684,13 +13676,6 @@ ${JSON.stringify(
     for (const group of appRouterLambdaGroups) {
       group.isStreaming = true;
       group.isAppRouter = true;
-      if (hasActionOutputSupport) {
-        appRouterStreamingActionLambdaGroups.push({
-          ...group,
-          isActionLambda: true,
-          isStreaming: true
-        });
-      }
     }
     for (const group of appRouteHandlersLambdaGroups) {
       if (!group.isPrerenders) {
@@ -13894,16 +13879,6 @@ ${JSON.stringify(
         options.layers.push(appNotFoundPsuedoLayer.pseudoLayer);
       }
       const lambda = await createLambdaFromPseudoLayers(options);
-      let revalidate;
-      if (group.isExperimentalPPR) {
-        if (!options.isStreaming) {
-          throw new Error("Invariant: PPR lambda isn't streaming");
-        }
-        revalidate = await createLambdaFromPseudoLayers({
-          ...options,
-          isStreaming: false
-        });
-      }
       for (const pageFilename of group.pages) {
         const pageName = pageFilename.replace(/\.js$/, "");
         const pagePathname = normalizePage(pageName);
@@ -13921,10 +13896,10 @@ ${JSON.stringify(
           outputName = `${outputName}.action`;
         }
         if (isRoutePPREnabled) {
-          if (!revalidate) {
-            throw new Error("Invariant: PPR lambda isn't set");
+          if (!options.isStreaming) {
+            throw new Error("Invariant: PPR lambda isn't streaming");
           }
-          lambdas[outputName] = revalidate;
+          lambdas[outputName] = lambda;
           if (!omittedPrerenderRoutes.has(pagePathname)) {
             const key = getPostponeResumePathname(entryDirectory, pageName);
             lambdas[key] = lambda;
@@ -13994,8 +13969,7 @@ ${JSON.stringify(
     hasPages404: routesManifest.pages404,
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
-    isAppPPREnabled,
-    hasActionOutputSupport
+    isAppPPREnabled
   });
   await Promise.all(
     Object.keys(prerenderManifest.staticRoutes).map(
@@ -14060,8 +14034,7 @@ ${JSON.stringify(
     bypassToken: prerenderManifest.bypassToken || "",
     isServerMode: true,
     dynamicMiddlewareRouteMap: middleware.dynamicRouteMap,
-    isAppPPREnabled,
-    hasActionOutputSupport
+    isAppPPREnabled
   }).then(
     (arr) => localizeDynamicRoutes(
       arr,
@@ -14218,9 +14191,6 @@ ${JSON.stringify(
         if (isAppPPREnabled) {
           edgeFunctions[`${pathname}${RSC_PREFETCH_SUFFIX}`] = edgeFunctions[pathname];
         }
-        if (hasActionOutputSupport) {
-          edgeFunctions[`${pathname}.action`] = edgeFunctions[pathname];
-        }
       }
     }
   }
@@ -14481,52 +14451,6 @@ ${JSON.stringify(
             override: true
           }
         ] : [],
-        ...hasActionOutputSupport ? [
-          // Create rewrites for streaming prerenders (.action routes)
-          // This contains separate rewrites for each possible "has" (action header, or content-type)
-          // Also includes separate handling for index routes which should match to /index.action.
-          // This follows the same pattern as the rewrites for .rsc files.
-          {
-            src: `^${import_path4.default.posix.join("/", entryDirectory, "/?")}`,
-            dest: import_path4.default.posix.join("/", entryDirectory, "/index.action"),
-            has: [
-              {
-                type: "header",
-                key: "next-action"
-              }
-            ],
-            missing: [
-              {
-                type: "header",
-                key: rscHeader
-              }
-            ],
-            continue: true,
-            override: true
-          },
-          {
-            src: `^${import_path4.default.posix.join(
-              "/",
-              entryDirectory,
-              "/((?!.+\\.action).+?)(?:/)?$"
-            )}`,
-            dest: import_path4.default.posix.join("/", entryDirectory, "/$1.action"),
-            has: [
-              {
-                type: "header",
-                key: "next-action"
-              }
-            ],
-            missing: [
-              {
-                type: "header",
-                key: rscHeader
-              }
-            ],
-            continue: true,
-            override: true
-          }
-        ] : [],
         {
           src: `^${import_path4.default.posix.join("/", entryDirectory, "/?")}`,
           has: [
@@ -14597,22 +14521,6 @@ ${JSON.stringify(
       // These need to come before handle: miss or else they are grouped
       // with that routing section
       ...afterFilesRewrites,
-      // Ensure that after we normalize `afterFilesRewrites`, unmatched actions are routed to the correct handler
-      // e.g. /foo/.action -> /foo.action. This should only ever match in cases where we're routing to an action handler
-      // and the rewrite normalization led to something like /foo/$1$rscsuff, and $1 had no match.
-      // This is meant to have parity with the .rsc handling below.
-      ...hasActionOutputSupport ? [
-        {
-          src: `${import_path4.default.posix.join("/", entryDirectory, "/\\.action$")}`,
-          dest: `${import_path4.default.posix.join("/", entryDirectory, "/index.action")}`,
-          check: true
-        },
-        {
-          src: `${import_path4.default.posix.join("/", entryDirectory, "(.+)/\\.action$")}`,
-          dest: `${import_path4.default.posix.join("/", entryDirectory, "$1.action")}`,
-          check: true
-        }
-      ] : [],
       // ensure non-normalized /.rsc from rewrites is handled
       ...appPathRoutesManifest ? [
         {
@@ -16251,8 +16159,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       canUsePreviewMode,
       bypassToken: prerenderManifest.bypassToken || "",
       isServerMode,
-      isAppPPREnabled: false,
-      hasActionOutputSupport: false
+      isAppPPREnabled: false
     }).then(
       (arr) => localizeDynamicRoutes(
         arr,
@@ -16278,8 +16185,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         canUsePreviewMode,
         bypassToken: prerenderManifest.bypassToken || "",
         isServerMode,
-        isAppPPREnabled: false,
-        hasActionOutputSupport: 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.3.6",
+  "version": "4.3.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": "8.3.4",
+    "@vercel/build-utils": "8.4.0",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",