@vercel/next 4.12.5 → 4.13.0

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
             });
@@ -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,
@@ -18315,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/dist/middleware-launcher.js

@@ -108,33 +108,28 @@ var conf = __NEXT_CONFIG__;
 globalThis.AsyncLocalStorage = require("async_hooks").AsyncLocalStorage;
 var middlewareModule = require("__NEXT_MIDDLEWARE_PATH__");
 var serve = async (request) => {
-  try {
-    const context = getContext();
-    return await withNextRequestContext(
-      { waitUntil: context.waitUntil },
-      async () => {
-        let middlewareHandler = await middlewareModule;
-        middlewareHandler = middlewareHandler.default || middlewareHandler;
-        const result = await middlewareHandler({
-          request: {
-            url: request.url,
-            method: request.method,
-            headers: toPlainHeaders(request.headers),
-            nextConfig: conf,
-            page: "/middleware",
-            body: request.method !== "GET" && request.method !== "HEAD" ? request.body : void 0,
-            waitUntil: context.waitUntil
-          }
-        });
-        if (result.waitUntil && context.waitUntil) {
-          context.waitUntil(result.waitUntil);
+  const context = getContext();
+  return await withNextRequestContext(
+    { waitUntil: context.waitUntil },
+    async () => {
+      let middlewareHandler = await middlewareModule;
+      middlewareHandler = middlewareHandler.default || middlewareHandler;
+      const result = await middlewareHandler({
+        request: {
+          url: request.url,
+          method: request.method,
+          headers: toPlainHeaders(request.headers),
+          nextConfig: conf,
+          page: "/middleware",
+          body: request.method !== "GET" && request.method !== "HEAD" ? request.body : void 0,
+          waitUntil: context.waitUntil
         }
-        return result.response;
+      });
+      if (result.waitUntil && context.waitUntil) {
+        context.waitUntil(result.waitUntil);
       }
-    );
-  } catch (err) {
-    console.error(err);
-    process.exit(1);
-  }
+      return result.response;
+    }
+  );
 };
 module.exports = serve;

package/dist/server-launcher.js

@@ -53,19 +53,11 @@ var nextServer = new NextServer({
   customServer: false
 });
 var serve = (handler) => async (req, res) => {
-  try {
-    const vercelContext = getContext();
-    await withNextRequestContext(
-      { waitUntil: vercelContext.waitUntil },
-      () => {
-        // @preserve entryDirectory handler
-        return handler(req, res);
-      }
-    );
-  } catch (err) {
-    console.error(err);
-    process.exit(1);
-  }
+  const vercelContext = getContext();
+  await withNextRequestContext({ waitUntil: vercelContext.waitUntil }, () => {
+    // @preserve entryDirectory handler
+    return handler(req, res);
+  });
 };
 module.exports = serve(nextServer.getRequestHandler());
 if ((conf.experimental?.ppr || conf.experimental?.cacheComponents) && "getRequestHandlerWithMetadata" in nextServer && typeof nextServer.getRequestHandlerWithMetadata === "function") {

package/package.json

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