@vercel/next 4.2.14 → 4.2.16

package/dist/index.js

@@ -13057,18 +13057,18 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   }
   const isOmittedOrNotFound = isOmitted || isNotFound;
   let htmlFsRef = null;
-  let prerender;
+  let postponedPrerender;
   if (experimentalPPR && appDir) {
     const htmlPath = import_path2.default.join(appDir, `${routeFileNoExt}.html`);
     const metaPath = import_path2.default.join(appDir, `${routeFileNoExt}.meta`);
     if (import_fs_extra3.default.existsSync(htmlPath) && import_fs_extra3.default.existsSync(metaPath)) {
       const meta = JSON.parse(await import_fs_extra3.default.readFile(metaPath, "utf8"));
       if ("postponed" in meta && typeof meta.postponed === "string") {
-        prerender = meta.postponed;
+        postponedPrerender = meta.postponed;
         initialHeaders ??= {};
         initialHeaders["content-type"] = `application/x-nextjs-pre-render; state-length=${meta.postponed.length}`;
         const html = await import_fs_extra3.default.readFileSync(htmlPath, "utf8");
-        prerender += html;
+        postponedPrerender += html;
       }
     }
     if (!dataRoute?.endsWith(".rsc")) {
@@ -13082,12 +13082,12 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       );
     }
   }
-  if (prerender) {
+  if (postponedPrerender) {
     const contentType = initialHeaders?.["content-type"];
     if (!contentType) {
       throw new Error("Invariant: contentType can't be undefined");
     }
-    htmlFsRef = new import_build_utils.FileBlob({ contentType, data: prerender });
+    htmlFsRef = new import_build_utils.FileBlob({ contentType, data: postponedPrerender });
   } else if (appDir && !dataRoute && !prefetchDataRoute && isAppPathRoute && !(isBlocking || isFallback)) {
     const contentType = initialHeaders?.["content-type"];
     const fsPath = import_path2.default.join(appDir, `${routeFileNoExt}.body`);
@@ -13124,7 +13124,14 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     isFallback || isBlocking || isNotFound && !static404Page || !dataRoute ? null : new import_build_utils.FileFsRef({
       fsPath: import_path2.default.join(
         isAppPathRoute && !isOmittedOrNotFound && appDir ? appDir : pagesDir,
-        `${isOmittedOrNotFound ? localePrefixed404 ? addLocaleOrDefault("/404.html", routesManifest, locale) : "/404.html" : isAppPathRoute ? prefetchDataRoute || dataRoute : routeFileNoExt + ".json"}`
+        `${isOmittedOrNotFound ? localePrefixed404 ? addLocaleOrDefault("/404.html", routesManifest, locale) : "/404.html" : isAppPathRoute ? (
+          // When experimental PPR is enabled, we expect that the data
+          // that should be served as a part of the prerender should
+          // be from the prefetch data route. If this isn't enabled
+          // for ppr, the only way to get the data is from the data
+          // route.
+          experimentalPPR ? prefetchDataRoute : dataRoute
+        ) : routeFileNoExt + ".json"}`
       )
     })
   );
@@ -13168,7 +13175,6 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
   } else if (experimentalPPR) {
     throw new Error("Invariant: expected to find prefetch data route PPR");
   }
-  const outputPrerenderPathData = outputPathPrefetchData || outputPathData;
   if (isSharedLambdas) {
     const outputSrcPathPage = normalizeIndexOutput(
       import_path2.default.join(
@@ -13205,8 +13211,11 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     if (!canUsePreviewMode || routeKey === "/404" && !lambdas[outputPathPage]) {
       htmlFsRef.contentType = htmlContentType;
       prerenders[outputPathPage] = htmlFsRef;
-      if (outputPrerenderPathData) {
-        prerenders[outputPrerenderPathData] = jsonFsRef;
+      if (outputPathPrefetchData) {
+        prerenders[outputPathPrefetchData] = jsonFsRef;
+      }
+      if (outputPathData && !experimentalPPR) {
+        prerenders[outputPathData] = jsonFsRef;
       }
     }
   }
@@ -13290,16 +13299,15 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         }
       } : {}
     });
-    if (outputPrerenderPathData) {
-      let normalizedPathData = outputPrerenderPathData;
-      if ((srcRoute === "/" || srcRoute == "/index") && outputPrerenderPathData.endsWith(RSC_PREFETCH_SUFFIX)) {
-        delete lambdas[normalizedPathData];
-        normalizedPathData = normalizedPathData.replace(
-          /([^/]+\.prefetch\.rsc)$/,
-          "__$1"
-        );
+    const normalizePathData = (pathData) => {
+      if ((srcRoute === "/" || srcRoute == "/index") && pathData.endsWith(RSC_PREFETCH_SUFFIX)) {
+        delete lambdas[pathData];
+        return pathData.replace(/([^/]+\.prefetch\.rsc)$/, "__$1");
       }
-      prerenders[normalizedPathData] = new import_build_utils.Prerender({
+      return pathData;
+    };
+    if (outputPathData || outputPathPrefetchData) {
+      const prerender = new import_build_utils.Prerender({
         expiration: initialRevalidate,
         lambda,
         allowQuery,
@@ -13315,13 +13323,18 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
             ...initialHeaders,
             "content-type": rscContentTypeHeader,
             vary: rscVaryHeader,
-            // If it contains a pre-render, then it was postponed.
-            ...prerender && rscDidPostponeHeader ? { [rscDidPostponeHeader]: "1" } : {}
+            ...postponedPrerender && rscDidPostponeHeader ? { [rscDidPostponeHeader]: "1" } : {}
           }
         } : {}
       });
+      if (outputPathPrefetchData) {
+        prerenders[normalizePathData(outputPathPrefetchData)] = prerender;
+      }
+      if (outputPathData && !experimentalPPR) {
+        prerenders[normalizePathData(outputPathData)] = prerender;
+      }
     }
-    if (outputPrerenderPathData?.endsWith(".json") && appDir) {
+    if (outputPathData?.endsWith(".json") && appDir) {
       const dummyOutput = new import_build_utils.FileBlob({
         data: "{}",
         contentType: "application/json"
@@ -14438,7 +14451,7 @@ 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);
+  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) {
@@ -15875,9 +15888,38 @@ async function serverBuild({
           check: true
         }
       ] : [],
+      // before processing rewrites, remove any special `/index` routes that were added
+      // as these won't be properly normalized by `afterFilesRewrites` / `dynamicRoutes`
+      ...appPathRoutesManifest ? [
+        {
+          src: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            "/index(\\.action|\\.rsc)"
+          ),
+          dest: import_path4.default.posix.join("/", entryDirectory),
+          continue: true
+        }
+      ] : [],
       // 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 ? [
         {
@@ -15889,10 +15931,28 @@ async function serverBuild({
           ),
           check: true
         },
+        {
+          src: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            "(.+)/\\.prefetch\\.rsc$"
+          ),
+          dest: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            `$1${RSC_PREFETCH_SUFFIX}`
+          ),
+          check: true
+        },
         {
           src: import_path4.default.posix.join("/", entryDirectory, "/\\.rsc$"),
           dest: import_path4.default.posix.join("/", entryDirectory, `/index.rsc`),
           check: true
+        },
+        {
+          src: import_path4.default.posix.join("/", entryDirectory, "(.+)/\\.rsc$"),
+          dest: import_path4.default.posix.join("/", entryDirectory, "$1.rsc"),
+          check: true
         }
       ] : [],
       { handle: "resource" },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.2.14",
+  "version": "4.2.16",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -13,7 +13,7 @@
     "dist"
   ],
   "dependencies": {
-    "@vercel/nft": "0.27.0"
+    "@vercel/nft": "0.27.2"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.19",
@@ -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.2.0",
+    "@vercel/build-utils": "8.2.2",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",