@vercel/next 4.0.15 → 4.0.17

package/dist/index.js

@@ -10707,7 +10707,7 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     isAppPathRoute = true;
   }
   const isOmittedOrNotFound = isOmitted || isNotFound;
-  let htmlFsRef;
+  let htmlFsRef = null;
   let prerender;
   if (experimentalPPR && appDir) {
     const htmlPath = import_path2.default.join(appDir, `${routeFileNoExt}.html`);
@@ -10739,12 +10739,15 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
       throw new Error("Invariant: contentType can't be undefined");
     }
     htmlFsRef = new import_build_utils.FileBlob({ contentType, data: prerender });
-  } else if (appDir && !dataRoute && isAppPathRoute && !(isBlocking || isFallback)) {
+  } else if (appDir && !dataRoute && !prefetchDataRoute && isAppPathRoute && !(isBlocking || isFallback)) {
     const contentType = initialHeaders?.["content-type"];
-    htmlFsRef = new import_build_utils.FileFsRef({
-      fsPath: import_path2.default.join(appDir, `${routeFileNoExt}.body`),
-      contentType: contentType || "text/html;charset=utf-8"
-    });
+    const fsPath = import_path2.default.join(appDir, `${routeFileNoExt}.body`);
+    if (import_fs_extra3.default.existsSync(fsPath)) {
+      htmlFsRef = new import_build_utils.FileFsRef({
+        fsPath,
+        contentType: contentType || "text/html;charset=utf-8"
+      });
+    }
   } else {
     htmlFsRef = isBlocking || isNotFound && !static404Page ? (
       // Blocking pages do not have an HTML fallback
@@ -12014,6 +12017,19 @@ async function serverBuild({
         value.contentType = rscContentTypeHeader;
       }
     }
+    for (const rewrite of afterFilesRewrites) {
+      if (rewrite.src && rewrite.dest) {
+        rewrite.src = rewrite.src.replace(
+          "(?:/)?",
+          "(?<rscsuff>(\\.prefetch)?\\.rsc)?(?:/)?"
+        );
+        let destQueryIndex = rewrite.dest.indexOf("?");
+        if (destQueryIndex === -1) {
+          destQueryIndex = rewrite.dest.length;
+        }
+        rewrite.dest = rewrite.dest.substring(0, destQueryIndex) + "$rscsuff" + rewrite.dest.substring(destQueryIndex);
+      }
+    }
   }
   const isCorrectNotFoundRoutes = import_semver3.default.gte(
     nextVersion,
@@ -13314,6 +13330,23 @@ async function serverBuild({
       // These need to come before handle: miss or else they are grouped
       // with that routing section
       ...afterFilesRewrites,
+      // ensure non-normalized /.rsc from rewrites is handled
+      ...appPathRoutesManifest ? [
+        {
+          src: import_path4.default.posix.join("/", entryDirectory, "/\\.prefetch\\.rsc$"),
+          dest: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            `/__index${RSC_PREFETCH_SUFFIX}`
+          ),
+          check: true
+        },
+        {
+          src: import_path4.default.posix.join("/", entryDirectory, "/\\.rsc$"),
+          dest: import_path4.default.posix.join("/", entryDirectory, `/index.rsc`),
+          check: true
+        }
+      ] : [],
       { handle: "resource" },
       ...fallbackRewrites,
       // make sure 404 page is used when a directory is matched without

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.0.15",
+  "version": "4.0.17",
   "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.24.2"
+    "@vercel/nft": "0.26.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": "7.2.5",
+    "@vercel/build-utils": "7.4.1",
     "@vercel/routing-utils": "3.1.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",